[amarok] /: Fix volume control not working.

[Bart Cerneels]

Git commit 219298b2481cb228d05f8c963d28b40500ad2507 by Bart Cerneels.
Committed on 25/11/2011 at 15:17.
Pushed by shanachie into branch 'master'.

Fix volume control not working.

QA fail: should have been spotted in review and integration testing.

CCMAIL:amarok-devel at kde.org

M  +1    -0    ChangeLog
M  +0    -1    src/EngineController.cpp

http://commits.kde.org/amarok/219298b2481cb228d05f8c963d28b40500ad2507

diff --git a/ChangeLog b/ChangeLog
index a64a82d..1df577c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Amarok ChangeLog
 
 Version 2.5
   BUGFIXES:
+    * Fix volume control from within Amarok.
     * Fix slow startup because of imported playlists. (BR 284761)
     * Fix audio CD detection on Amarok start. (BR 276032)
     * Set a default filename scheme for USB Mass Storage (BR 285900)
diff --git a/src/EngineController.cpp b/src/EngineController.cpp
index 6060137..81f39b7 100644
--- a/src/EngineController.cpp
+++ b/src/EngineController.cpp
@@ -150,7 +150,6 @@ EngineController::initializePhonon()
 
     m_audio = new Phonon::AudioOutput( Phonon::MusicCategory, this );
     m_audioDataOutput = new Phonon::AudioDataOutput( this );
-    m_audio = new Phonon::AudioOutput( Phonon::MusicCategory, this );
 
     m_dataPath = Phonon::createPath( m_media.data(), m_audioDataOutput.data() );
     m_path = Phonon::createPath( m_media.data(), m_audio.data() );