Fwd: kdesupport/phonon/phonon

[Seb Ruiz]

Just an FYI.

---------- Forwarded message ----------
From: Thiago Macieira <thiago at kde.org>
Date: 2009/2/4
Subject: kdesupport/phonon/phonon
To: kde-commits at kde.org


SVN commit 921006 by thiago:

Fixes:    Crash in Amarok

Task:     None, running Amarok
RevBy:    Jens
AutoTest: None
Details:  createBackend() ended up doing emit adaptor->..., before
adaptor got a chance to be created. So invert the order and initialise
the adaptor first thing.

Someone please backport to 4.3.

 M  +7 -6      audiooutput.cpp


--- trunk/kdesupport/phonon/phonon/audiooutput.cpp #921005:921006
@@ -77,12 +77,6 @@
 void AudioOutputPrivate::init(Phonon::Category c)
 {
    Q_Q(AudioOutput);
-    category = c;
-
-    // select hardware device according to the category
-    device = AudioOutputDevice::fromIndex(GlobalConfig().audioOutputDeviceFor(category,
GlobalConfig::AdvancedDevicesFromSettings |
GlobalConfig::HideUnavailableDevices));
-
-    createBackendObject();
 #ifndef QT_NO_DBUS
    adaptor = new AudioOutputAdaptor(q);
    static unsigned int number = 0;
@@ -94,6 +88,13 @@
    q->connect(q, SIGNAL(mutedChanged(bool)), adaptor,
SIGNAL(mutedChanged(bool)));
 #endif

+    category = c;
+
+    // select hardware device according to the category
+    device = AudioOutputDevice::fromIndex(GlobalConfig().audioOutputDeviceFor(category,
GlobalConfig::AdvancedDevicesFromSettings |
GlobalConfig::HideUnavailableDevices));
+
+    createBackendObject();
+
    q->connect(Factory::sender(),
SIGNAL(availableAudioOutputDevicesChanged()),
SLOT(_k_deviceListChanged()));
 }




-- 
Seb Ruiz

http://www.sebruiz.net/
http://amarok.kde.org/