diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-21 13:23:30 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-29 16:00:11 (GMT) |
| commit | d24fd9b951352fe184ff9bccb0f53e18368e8735 (patch) | |
| tree | 5221801bd2938bfff03334caca60c44ae93c05c2 /src/3rdparty/phonon/gstreamer/devicemanager.cpp | |
| parent | 488a89e2671fb93981db6c71f3557500b9f52588 (diff) | |
| download | Qt-d24fd9b951352fe184ff9bccb0f53e18368e8735.zip Qt-d24fd9b951352fe184ff9bccb0f53e18368e8735.tar.gz Qt-d24fd9b951352fe184ff9bccb0f53e18368e8735.tar.bz2 | |
Fix LIBRARY and SETTINGS in phonon
Reviewed-by: Jens Bache-Wiig
Squash me with Fix LIBRARY and SETTINGS in phonon 7d2282
Diffstat (limited to 'src/3rdparty/phonon/gstreamer/devicemanager.cpp')
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/devicemanager.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/gstreamer/devicemanager.cpp b/src/3rdparty/phonon/gstreamer/devicemanager.cpp index 2240396..86463c1 100644 --- a/src/3rdparty/phonon/gstreamer/devicemanager.cpp +++ b/src/3rdparty/phonon/gstreamer/devicemanager.cpp @@ -72,18 +72,21 @@ DeviceManager::DeviceManager(Backend *backend) : QObject(backend) , m_backend(backend) { + m_audioSink = qgetenv("PHONON_GST_AUDIOSINK"); + m_videoSinkWidget = qgetenv("PHONON_GST_VIDEOMODE"); + +#ifndef QT_NO_SETTINGS QSettings settings(QLatin1String("Trolltech")); settings.beginGroup(QLatin1String("Qt")); - m_audioSink = qgetenv("PHONON_GST_AUDIOSINK"); if (m_audioSink.isEmpty()) { m_audioSink = settings.value(QLatin1String("audiosink"), "Auto").toByteArray().toLower(); } - m_videoSinkWidget = qgetenv("PHONON_GST_VIDEOMODE"); if (m_videoSinkWidget.isEmpty()) { m_videoSinkWidget = settings.value(QLatin1String("videomode"), "Auto").toByteArray().toLower(); } +#endif //QT_NO_SETTINGS if (m_backend->isValid()) updateDeviceList(); |