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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/engine/phonon
From:       Matthias Kretz <kretz () kde ! org>
Date:       2007-08-10 15:42:14
Message-ID: 1186760534.697974.22251.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 698647 by mkretz:

adapt to phonon-Trolltech branch API changes

 M  +2 -5      phonon-engine.cpp  
 M  +0 -1      phonon-engine.h  


--- trunk/extragear/multimedia/amarok/src/engine/phonon/phonon-engine.cpp #698646:698647
@@ -25,7 +25,7 @@
 #include <kmimetype.h>
 
 #include <phonon/mediaobject.h>
-#include <phonon/audiopath.h>
+#include <phonon/path.h>
 #include <phonon/audiooutput.h>
 #include <phonon/backendcapabilities.h>
 
@@ -35,7 +35,6 @@
 PhononEngine::PhononEngine()
         : EngineBase()
         , m_mediaObject( 0 )
-        , m_audioPath  ( 0 )
         , m_audioOutput( 0 )
 {
     debug() << "Yay for Phonon being constructed";
@@ -54,13 +53,11 @@
     debug() << "'Phonon Engine has been successfully created.'\n";
 
     m_mediaObject = new Phonon::MediaObject( this );
-    m_audioPath   = new Phonon::AudioPath( this );
     m_audioOutput = new Phonon::AudioOutput( Phonon::MusicCategory, this );
 
     m_mediaObject->setTickInterval( 100 ); // Needed for position() to work
 
-    m_mediaObject->addAudioPath( m_audioPath );
-    m_audioPath->addOutput( m_audioOutput );
+    Phonon::createPath(m_mediaObject, m_audioOutput);
 
     connect( m_mediaObject, SIGNAL( finished() ), SIGNAL( trackEnded() ) );
     //connect( m_mediaObject, SIGNAL( length(qint64)), SLOT( length() ) );
--- trunk/extragear/multimedia/amarok/src/engine/phonon/phonon-engine.h #698646:698647
@@ -49,7 +49,6 @@
     virtual Engine::State state() const;
 
     Phonon::MediaObject *m_mediaObject;
-    Phonon::AudioPath   *m_audioPath;
     Phonon::AudioOutput *m_audioOutput;
 
 // private slots:
[prev in list] [next in list] [prev in thread] [next in thread]