[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/phonon/xine
From:       Matthias Kretz <kretz () kde ! org>
Date:       2007-12-06 15:06:33
Message-ID: 1196953593.433723.31363.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 745606 by mkretz:

don't break the current output device if the new device is invalid

 M  +4 -4      audiooutput.cpp  


--- trunk/KDE/kdebase/runtime/phonon/xine/audiooutput.cpp #745605:745606
@@ -85,13 +85,13 @@
 
 bool AudioOutput::setOutputDevice(int newDevice)
 {
-    m_device = newDevice;
-    K_XT(AudioOutputXT)->m_audioPort.setAudioOutput(0);
-    K_XT(AudioOutputXT)->m_audioPort = AudioPort(m_device);
-    if (!K_XT(AudioOutputXT)->m_audioPort.isValid()) {
+    AudioPort newPort(newDevice);
+    if (!newPort.isValid()) {
         kDebug(610) << "new audio port is invalid";
         return false;
     }
+    m_device = newDevice;
+    K_XT(AudioOutputXT)->m_audioPort = newPort;
     K_XT(AudioOutputXT)->m_audioPort.setAudioOutput(this);
     SourceNode *src = source();
     if (src) {
[prev in list] [next in list] [prev in thread] [next in thread]