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

List:       kde-commits
Subject:    KDE/kdegames/kpat
From:       Parker Coates <parker.coates () kdemail ! net>
Date:       2012-02-21 2:52:47
Message-ID: 20120221025247.CABE6AC896 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1281294 by coates:

Port from Phonon to KgSound.

Well, that was really easy.

 M  +5 -13     soundengine.cpp  
 M  +3 -5      soundengine.h  


--- trunk/KDE/kdegames/kpat/soundengine.cpp #1281293:1281294
@@ -21,16 +21,10 @@
 
 
 SoundEngine::SoundEngine( QObject * parent )
-  : QObject( parent )
+  : QObject( parent ),
+    m_cardPickedUp( KStandardDirs::locate( "appdata", "sounds/card-pickup.ogg" ) ),
+    m_cardPutDown( KStandardDirs::locate( "appdata", "sounds/card-down.ogg" ) )
 {
-    m_mediaObject = Phonon::createPlayer( Phonon::GameCategory );
-    m_mediaObject->setParent( this );
-
-    QString path = KStandardDirs::locate( "appdata", "sounds/card-pickup.ogg" );
-    m_cardPickedUp = Phonon::MediaSource( path );
-
-    path = KStandardDirs::locate( "appdata", "sounds/card-down.ogg" );
-    m_cardPutDown = Phonon::MediaSource( path );
 }
 
 
@@ -41,15 +35,13 @@
 
 void SoundEngine::cardsPickedUp()
 {
-    m_mediaObject->setCurrentSource( m_cardPickedUp );
-    m_mediaObject->play();
+    m_cardPickedUp.start();
 }
 
 
 void SoundEngine::cardsPutDown()
 {
-    m_mediaObject->setCurrentSource( m_cardPutDown );
-    m_mediaObject->play();
+    m_cardPutDown.start();
 }
 
 
--- trunk/KDE/kdegames/kpat/soundengine.h #1281293:1281294
@@ -18,7 +18,7 @@
 #ifndef SOUNDENGINE_H
 #define SOUNDENGINE_H
 
-#include <Phonon/MediaObject>
+#include <KgSound>
 
 
 class SoundEngine : public QObject
@@ -34,10 +34,8 @@
     void cardsPutDown();
 
 private:
-    Phonon::MediaObject * m_mediaObject;
-
-    Phonon::MediaSource m_cardPickedUp;
-    Phonon::MediaSource m_cardPutDown;
+    KgSound m_cardPickedUp;
+    KgSound m_cardPutDown;
 };
 
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]