3 files changed, 40 insertions, 14 deletions

diff --git a/pacman-c++/phononplayer/phononplayer.cpp b/pacman-c++/phononplayer/phononplayer.cpp
index 1f537d6..3d7b446 100644
--- a/pacman-c++/phononplayer/phononplayer.cpp
+++ b/pacman-c++/phononplayer/phononplayer.cpp
@@ -1,4 +1,5 @@
 #include "phononplayer.h"
+#include "audio.h"
 #include <QtPlugin>
 #include <QCoreApplication>
 
@@ -12,9 +13,8 @@ Q_EXPORT_PLUGIN2(phononplayer, PhononPlayerFactory)
 /* --------------------------------------------------------------- */
 
 PhononPlayer::PhononPlayer(QObject *parent)
-  : AudioPlayer(parent)
+  : AudioPlayer(parent), m_working(false)
 {
-  m_working = AudioManager::isWorking();
   m_player = new Phonon::MediaObject(this);
   m_output = new Phonon::AudioOutput(Phonon::MusicCategory, this);
   Phonon::createPath(m_player, m_output);
@@ -39,25 +39,36 @@ bool PhononPlayer::isMuted() const
 
 void PhononPlayer::play()
 {
+  if (!m_working)
+    return;
   m_player->play();
 }
 
-void PhononPlayer::play(Sound::Type sound)
+void PhononPlayer::play(QFile *sound, unsigned int length)
 {
   if (!m_working)
     return;
-  m_player->setCurrentSource(Phonon::MediaSource(AudioManager::self()->sound(sound)));
+  setSource(sound, length);
   play();
 }
 
+void PhononPlayer::setSource(QFile *sound, unsigned int /* length */)
+{
+  if (!m_working)
+    return;
+  m_player->setCurrentSource(Phonon::MediaSource(sound));
+}
+
 bool PhononPlayer::isPlaying()
 {
   return m_player->state() == Phonon::PlayingState;
 }
 
-void PhononPlayer::enqueue(Sound::Type sound)
+void PhononPlayer::enqueue(QFile *sound, unsigned int /* length */)
 {
-  m_player->enqueue(Phonon::MediaSource(AudioManager::self()->sound(sound)));
+  if (!m_working)
+    return;
+  m_player->enqueue(Phonon::MediaSource(sound));
 }
 
 void PhononPlayer::pause()
@@ -96,12 +107,22 @@ void PhononPlayer::setPrefinishMark(qint32 msecToEnd)
   m_player->setPrefinishMark(msecToEnd);
 }
 
+void PhononPlayer::seek(qint64 time)
+{
+  m_player->seek(time);
+}
+
+void PhononPlayer::setWorking(bool working)
+{
+  m_working = working;
+}
+
 /* this is a simple hack to check if phonon can actually play sounds.. */
-void PhononPlayer::test(QFile *testsound, qint32 length)
+void PhononPlayer::test(QFile *sound, unsigned int length)
 {
   m_player->stop();
   m_output->setVolume(0);
-  m_player->setCurrentSource(Phonon::MediaSource(testsound));
+  m_player->setCurrentSource(Phonon::MediaSource(sound));
   connect(m_player, SIGNAL(stateChanged(Phonon::State, Phonon::State)), this, SLOT(stateChanged_ex(Phonon::State, Phonon::State)));
   m_player->play();
 
diff --git a/pacman-c++/phononplayer/phononplayer.h b/pacman-c++/phononplayer/phononplayer.h
index ca56726..8b9ab06 100644
--- a/pacman-c++/phononplayer/phononplayer.h
+++ b/pacman-c++/phononplayer/phononplayer.h
@@ -1,7 +1,7 @@
 #ifndef PHONONPLAYER_H
 #define PHONONPLAYER_H
 
-#include "audio.h"
+#include "audiointerface.h"
 #include <QObject>
 #include <QFile>
 #include <QThread>
@@ -25,6 +25,7 @@ class PhononPlayer
 {
   Q_OBJECT
   friend class AudioManager;
+  friend class PhononPlayerFactory;
 
 private:
   class Sleeper
@@ -37,14 +38,11 @@ private:
   };
 
 public:
-  PhononPlayer(QObject *parent = 0);
   virtual bool isWorking() const;
   virtual void setMuted(bool mute = true);
   virtual bool isMuted() const;
   virtual void play();
-  virtual void play(Sound::Type sound);
   virtual bool isPlaying();
-  virtual void enqueue(Sound::Type sound);
   virtual void pause();
   virtual bool isPaused();
   virtual void stop();
@@ -52,9 +50,15 @@ public:
   virtual void clear();
   virtual void clearQueue();
   virtual void setPrefinishMark(qint32 msecToEnd);
+  virtual void seek(qint64 time);
 
 protected:
-  void test(QFile *testsound, qint32 length);
+  PhononPlayer(QObject *parent = 0);
+  virtual void setWorking(bool working = true);
+  void test(QFile *sound, unsigned int length);
+  virtual void play(QFile *sound, unsigned int length);
+  virtual void setSource(QFile *sound, unsigned int length);
+  virtual void enqueue(QFile *sound, unsigned int length);
 
 protected slots:
   virtual void prefinishMarkReached_ex(qint32 mark);
diff --git a/pacman-c++/phononplayer/phononplayer.pro b/pacman-c++/phononplayer/phononplayer.pro
index 9482454..a11626c 100644
--- a/pacman-c++/phononplayer/phononplayer.pro
+++ b/pacman-c++/phononplayer/phononplayer.pro
@@ -8,4 +8,5 @@ QT += phonon
 include(../common.pri)
 
 SOURCES += phononplayer.cpp
-HEADERS += phononplayer.h
+HEADERS += phononplayer.h \
+    ../common/audiointerface.h