1 files changed, 36 insertions, 18 deletions

diff --git a/pacman-c++/audio.cpp b/pacman-c++/audio.cpp
index d627c75..5fb4416 100644
--- a/pacman-c++/audio.cpp
+++ b/pacman-c++/audio.cpp
@@ -15,18 +15,19 @@ AudioManager::AudioManager()
   : m_muted(true)
 {
   if (Constants::server)
+  {
     qDebug() << "Server has no sound";
+    m_players.append(new AudioPlayer(this));
+  }
   else
   {
     preload();
-
     AudioPlayer *firstplayer = new AudioPlayer(this);
     firstplayer->test(m_sounds[Sound::WakaWaka]);
     m_working = firstplayer->m_working;
     m_players.append(firstplayer);
-
-    m_muted = false;
   }
+  m_muted = false;
 }
 
 AudioManager *AudioManager::self()
@@ -97,15 +98,9 @@ AudioPlayer *AudioManager::audioPlayer()
   return m_players.at(0);
 }
 
-void AudioManager::play(Sound::Type sound)
+void AudioManager::play(Sound::Type sound, bool wait)
 {
-  if (!isWorking())
-  {
-    emit audioPlayer()->finished();
-    return;
-  }
-
-  audioPlayer()->play(sound);
+  audioPlayer()->play(sound, wait);
 }
 
 void AudioManager::enqueue(Sound::Type sound)
@@ -151,11 +146,14 @@ QFile *AudioManager::sound(Sound::Type sound)
 /* --------------------------------------------------------------- */
 
 AudioPlayer::AudioPlayer(QObject *parent)
-  : Phonon::MediaObject(parent)
+  : Phonon::MediaObject(parent), m_working(false)
 {
-  m_working = AudioManager::m_working;
-  m_output = new Phonon::AudioOutput(Phonon::MusicCategory, this);
-  Phonon::createPath(this, m_output);
+  if (!Constants::server)
+  {
+    m_working = AudioManager::m_working;
+    m_output = new Phonon::AudioOutput(Phonon::MusicCategory, this);
+    Phonon::createPath(this, m_output);
+  }
 }
 
 bool AudioPlayer::isWorking() const
@@ -200,10 +198,25 @@ void AudioPlayer::play()
   Phonon::MediaObject::play();
 }
 
-void AudioPlayer::play(Sound::Type sound)
+void AudioPlayer::play(Sound::Type sound, bool wait)
 {
-  setCurrentSource(Phonon::MediaSource(AudioManager::self()->sound(sound)));
-  play();
+  if (m_working)
+  {
+    setCurrentSource(Phonon::MediaSource(AudioManager::self()->sound(sound)));
+    play();
+  }
+  else if (wait)
+  {
+    QTimer *timer = new QTimer(this);
+    timer->setSingleShot(true);
+    unsigned int interval = Sound::length[sound];
+    /* add a small delay server side only */
+    if (Constants::server)
+      interval += Constants::tick;
+    timer->setInterval(interval);
+    connect(timer, SIGNAL(timeout()), this, SLOT(finished_ex()));
+    timer->start();
+  }
 }
 
 /* this is a simple hack to check if phonon can actually play sounds.. */
@@ -227,6 +240,11 @@ void AudioPlayer::test(QFile *testsound)
   clear();
 }
 
+void AudioPlayer::finished_ex()
+{
+  emit finished();
+}
+
 void AudioPlayer::stateChanged_ex(Phonon::State newstate, Phonon::State /* oldstate */)
 {
   if (newstate != Phonon::ErrorState)