Changeset 561 for trunk/src/3rdparty/phonon/gstreamer/devicemanager.cpp
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/src/3rdparty/phonon/gstreamer/devicemanager.cpp
r2 r561 73 73 , m_backend(backend) 74 74 { 75 m_audioSink = qgetenv("PHONON_GST_AUDIOSINK"); 76 m_videoSinkWidget = qgetenv("PHONON_GST_VIDEOMODE"); 77 78 #ifndef QT_NO_SETTINGS 75 79 QSettings settings(QLatin1String("Trolltech")); 76 80 settings.beginGroup(QLatin1String("Qt")); 77 81 78 m_audioSink = qgetenv("PHONON_GST_AUDIOSINK");79 82 if (m_audioSink.isEmpty()) { 80 83 m_audioSink = settings.value(QLatin1String("audiosink"), "Auto").toByteArray().toLower(); 81 84 } 82 85 83 m_videoSinkWidget = qgetenv("PHONON_GST_VIDEOMODE");84 86 if (m_videoSinkWidget.isEmpty()) { 85 87 m_videoSinkWidget = settings.value(QLatin1String("videomode"), "Auto").toByteArray().toLower(); 86 88 } 89 #endif //QT_NO_SETTINGS 87 90 88 91 if (m_backend->isValid()) … … 244 247 } 245 248 249 #ifndef QT_NO_PHONON_VIDEO 246 250 AbstractRenderer *DeviceManager::createVideoRenderer(VideoWidget *parent) 247 251 { … … 266 270 return new WidgetRenderer(parent); 267 271 } 272 #endif //QT_NO_PHONON_VIDEO 268 273 269 274 /*
Note:
See TracChangeset
for help on using the changeset viewer.