Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/3rdparty/phonon/gstreamer/devicemanager.cpp

    r2 r561  
    7373        , m_backend(backend)
    7474{
     75    m_audioSink = qgetenv("PHONON_GST_AUDIOSINK");
     76    m_videoSinkWidget = qgetenv("PHONON_GST_VIDEOMODE");
     77
     78#ifndef QT_NO_SETTINGS
    7579    QSettings settings(QLatin1String("Trolltech"));
    7680    settings.beginGroup(QLatin1String("Qt"));
    7781
    78     m_audioSink = qgetenv("PHONON_GST_AUDIOSINK");
    7982    if (m_audioSink.isEmpty()) {
    8083        m_audioSink = settings.value(QLatin1String("audiosink"), "Auto").toByteArray().toLower();
    8184    }
    8285
    83     m_videoSinkWidget = qgetenv("PHONON_GST_VIDEOMODE");
    8486    if (m_videoSinkWidget.isEmpty()) {
    8587        m_videoSinkWidget = settings.value(QLatin1String("videomode"), "Auto").toByteArray().toLower();
    8688    }
     89#endif //QT_NO_SETTINGS
    8790
    8891    if (m_backend->isValid())
     
    244247}
    245248
     249#ifndef QT_NO_PHONON_VIDEO
    246250AbstractRenderer *DeviceManager::createVideoRenderer(VideoWidget *parent)
    247251{
     
    266270    return new WidgetRenderer(parent);
    267271}
     272#endif //QT_NO_PHONON_VIDEO
    268273
    269274/*
Note: See TracChangeset for help on using the changeset viewer.