- refactorized audio once more: audio is now a plugin which gets loaded at runtime

- thus server has no dependency to phonon any more
- remove client dependency to qtnetwork
- fix enet deinitialization on windows

1 files changed, 107 insertions, 40 deletions

diff --git a/pacman-c++/common/audio.h b/pacman-c++/common/audio.h
index 6aec42d..bc7d66e 100644
--- a/pacman-c++/common/audio.h
+++ b/pacman-c++/common/audio.h
@@ -4,13 +4,7 @@
 #include <QObject>
 #include <QList>
 #include <QFile>
-#include <QThread>
-#include <phonon/MediaObject>
-
-namespace Phonon
-{
-  class AudioOutput;
-}
+#include <QTimer>
 
 namespace Sound
 {
@@ -32,46 +26,98 @@ namespace Sound
 /* --------------------------------------------------------------- */
 
 class AudioPlayer
-  : public Phonon::MediaObject
+  : public QObject
 {
   Q_OBJECT
   friend class AudioManager;
 
-private:
-  class Sleeper
-    : public QThread
-  {
-  public:
-    static void sleep(unsigned long secs);
-    static void msleep(unsigned long msecs);
-    static void usleep(unsigned long usecs);
-  };
+public:
+  AudioPlayer(QObject *parent = 0)
+    : QObject(parent)
+  {}
+  virtual ~AudioPlayer()
+  {}
+  virtual bool isWorking() const = 0;
+  virtual void setMuted(bool mute = true) = 0;
+  virtual bool isMuted() const = 0;
+  virtual void play() = 0;
+  virtual void play(Sound::Type sound) = 0;
+  virtual bool isPlaying() = 0;
+  virtual void enqueue(Sound::Type sound) = 0;
+  virtual void pause() = 0;
+  virtual bool isPaused() = 0;
+  virtual void stop() = 0;
+  virtual bool isStopped() = 0;
+  virtual void clear() = 0;
+  virtual void clearQueue() = 0;
+  virtual void setPrefinishMark(qint32 msecToEnd) = 0;
+
+protected slots:
+  virtual void prefinishMarkReached_ex(qint32 mark) = 0;
+
+signals:
+  void finished();
+  void prefinishMarkReached(qint32 mark);
+
+protected:
+  virtual void test(QFile *testsound, qint32 length) = 0;
+};
+
+/* --------------------------------------------------------------- */
+
+class NoopAudioPlayer
+  : public AudioPlayer
+{
+  Q_OBJECT
+  friend class AudioManager;
 
 public:
-  AudioPlayer(QObject *parent = 0);
-  bool isWorking() const;
-  void setMuted(bool mute = true);
-  bool isMuted() const;
-  void setLoop(Sound::Type sound);
-  void play();
-  void play(Sound::Type sound, bool wait = false);
+  NoopAudioPlayer(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();
+  virtual bool isStopped();
+  virtual void clear();
+  virtual void clearQueue();
+  virtual void setPrefinishMark(qint32 msecToEnd);
+
+protected slots:
+  virtual void prefinishMarkReached_ex(qint32 mark);
 
 protected:
-  void test(QFile *testsound);
-  void setLoop(QFile *sound);
+  virtual void test(QFile *testsound, qint32 length);
 
-public slots:
-  void loopEnqueue();
+protected:
+  bool m_working;
+  bool m_muted;
+  bool m_playing;
+  bool m_paused;
+};
+
+/* --------------------------------------------------------------- */
+
+class FakeAudioPlayer
+  : public NoopAudioPlayer
+{
+  Q_OBJECT
+  friend class AudioManager;
+
+public:
+  FakeAudioPlayer(QObject *parent = 0);
+  virtual void play(Sound::Type sound);
 
 protected slots:
   void finished_ex();
-  void testFinished();
-  void stateChanged_ex(Phonon::State newstate, Phonon::State oldstate);
 
 protected:
-  bool m_working;
-  QFile *m_loopsound;
-  Phonon::AudioOutput *m_output;
+  QTimer m_timer;
 };
 
 /* --------------------------------------------------------------- */
@@ -102,17 +148,37 @@ protected:
 
 /* --------------------------------------------------------------- */
 
+class AudioPlayerFactory
+{
+public:
+  virtual ~AudioPlayerFactory()
+  {}
+  virtual AudioPlayer *create(QObject *parent = 0) = 0;
+};
+
+Q_DECLARE_INTERFACE(AudioPlayerFactory, "at.ac.tuwien.foop.pacman.AudioPlayerFactory/1.0");
+
+/* --------------------------------------------------------------- */
+
+class NoopAudioPlayerFactory
+  : public AudioPlayerFactory
+{
+public:
+  virtual AudioPlayer *create(QObject *parent = 0);
+};
+
+/* --------------------------------------------------------------- */
+
 class AudioManager
   : public QObject
 {
   Q_OBJECT
-  friend class AudioPlayer;
   friend class GaplessAudioPlayer;
 
 public:
   AudioManager();
   static AudioManager *self();
-  bool isWorking() const;
+  static bool isWorking();
   void setMuted(bool mute = true);
   bool isMuted() const;
   void pause();
@@ -121,21 +187,21 @@ public:
   void clearQueue() const;
 
   AudioPlayer *audioPlayer();
-  void play(Sound::Type sound, bool wait = false);
-  void enqueue(Sound::Type sound);
-
   void registerAudioPlayer(AudioPlayer *player);
   void unregisterAudioPlayer(AudioPlayer *player);
 
+  QFile *sound(Sound::Type sound);
+
 signals:
   void mutedChanged(bool muted);
 
 private slots:
   void unregisterAudioPlayer_helper(QObject *player);
 
-private:
+protected:
   void preload();
-  QFile *sound(Sound::Type sound);
+  bool tryLoadPhononPlugin();
+  AudioPlayer *createAudioPlayer();
 
 private:
   bool m_muted;
@@ -143,6 +209,7 @@ private:
   static AudioManager *m_instance;
   QList<QFile *> m_sounds;
   QList<AudioPlayer *> m_players;
+  AudioPlayerFactory *m_factory;
 };
 
 #endif // AUDIOPLAYER_H