try to play the sound more gapless. if that won't work for totycro I'll revert the crap. it makes the code really ugly

4 files changed, 58 insertions, 18 deletions

diff --git a/pacman-c++/actor.cpp b/pacman-c++/actor.cpp
index f56407b..56e8e86 100644
--- a/pacman-c++/actor.cpp
+++ b/pacman-c++/actor.cpp
@@ -10,7 +10,7 @@ static QVariant myBooleanInterpolator(const bool &start, const bool &end, qreal
 
 Actor::Actor(Color::Color color, bool local, QGraphicsItem *parent)
   : GameEntity(color, parent),m_direction(Actor::None), m_local(local),
-  m_wakaPlayer(NULL), m_roundPoints(0), m_gamePoints(0)
+  m_wakaPlayer1(NULL), m_wakaPlayer2(NULL), m_roundPoints(0), m_gamePoints(0)
 {
   /* DON'T set any pixmap here. we've a pixmap in the animation
    * but we need a sprite for the collision detection
@@ -57,11 +57,16 @@ Actor::Actor(Color::Color color, bool local, QGraphicsItem *parent)
   /* setup waka sound */
   if (local)
   {
-    m_wakaPlayer = new AudioPlayer(this);
-    if (m_wakaPlayer->isWorking())
+    m_wakaPlayer1 = new AudioPlayer(this);
+    m_wakaPlayer2 = new AudioPlayer(this);
+    if (m_wakaPlayer1->isWorking() && m_wakaPlayer2->isWorking())
     {
-      m_wakaPlayer->setLoop(Sound::WakaWaka);
-      AudioManager::self()->registerAudioPlayer(m_wakaPlayer);
+      m_wakaPlayer1->setPrefinishMark(100);
+      m_wakaPlayer2->setPrefinishMark(100);
+      connect(m_wakaPlayer1, SIGNAL(prefinishMarkReached(qint32)), this, SLOT(startPlayer2()));
+      connect(m_wakaPlayer2, SIGNAL(prefinishMarkReached(qint32)), this, SLOT(startPlayer1()));
+      AudioManager::self()->registerAudioPlayer(m_wakaPlayer1);
+      AudioManager::self()->registerAudioPlayer(m_wakaPlayer2);
     }
   }
 
@@ -232,18 +237,30 @@ void Actor::eatingPacman()
 
 void Actor::startEating()
 {
-  if (!m_local || !m_wakaPlayer->isWorking())
+  if (!m_local || !m_wakaPlayer1->isWorking())
     return;
-  if (m_wakaPlayer->state() != Phonon::PlayingState)
-    m_wakaPlayer->play();
+  if (m_wakaPlayer1->state() != Phonon::PlayingState && m_wakaPlayer2->state() != Phonon::PlayingState)
+    startPlayer1();
 }
 
 void Actor::stopEating()
 {
-  if (!m_local || !m_wakaPlayer->isWorking())
+  if (!m_local || !m_wakaPlayer1->isWorking())
     return;
-  if (m_wakaPlayer->state() != Phonon::PausedState)
-    m_wakaPlayer->pause();
+  if (m_wakaPlayer1->state() != Phonon::PausedState)
+    m_wakaPlayer1->pause();
+  if (m_wakaPlayer2->state() != Phonon::PausedState)
+    m_wakaPlayer2->pause();
+}
+
+void Actor::startPlayer1()
+{
+  m_wakaPlayer1->play(Sound::WakaWaka);
+}
+
+void Actor::startPlayer2()
+{
+  m_wakaPlayer2->play(Sound::WakaWaka);
 }
 
 unsigned int Actor::getRoundPoints()
diff --git a/pacman-c++/actor.h b/pacman-c++/actor.h
index 5ec1a59..1739d9f 100644
--- a/pacman-c++/actor.h
+++ b/pacman-c++/actor.h
@@ -46,12 +46,17 @@ public:
 private:
   void moveByServer(Movement direction);
 
+private slots:
+  void startPlayer1();
+  void startPlayer2();
+
 private:
   QPixmap m_pix;
   Movement m_direction;
   PixmapItem m_icon;
   bool m_local;
-  AudioPlayer *m_wakaPlayer;
+  AudioPlayer *m_wakaPlayer1;
+  AudioPlayer *m_wakaPlayer2;
 
   unsigned int m_roundPoints;
   unsigned int m_gamePoints;
diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp
index e254dbc..5dc392c 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/mainwidget.cpp
@@ -9,11 +9,16 @@ MainWidget::MainWidget(QWidget *parent)
   : QWidget(parent), m_currentKey(Transmission::none), m_running(false)
 {
   /* create audio player */
-  m_sirenPlayer = new AudioPlayer(this);
-  if (m_sirenPlayer->isWorking())
+  m_sirenPlayer1 = new AudioPlayer(this);
+  m_sirenPlayer2 = new AudioPlayer(this);
+  if (m_sirenPlayer1->isWorking() && m_sirenPlayer2->isWorking())
   {
-    m_sirenPlayer->setLoop(Sound::Ambient);
-    AudioManager::self()->registerAudioPlayer(m_sirenPlayer);
+    m_sirenPlayer1->setPrefinishMark(100);
+    m_sirenPlayer2->setPrefinishMark(100);
+    connect(m_sirenPlayer1, SIGNAL(prefinishMarkReached(qint32)), this, SLOT(startPlayer2()));
+    connect(m_sirenPlayer2, SIGNAL(prefinishMarkReached(qint32)), this, SLOT(startPlayer1()));
+    AudioManager::self()->registerAudioPlayer(m_sirenPlayer1);
+    AudioManager::self()->registerAudioPlayer(m_sirenPlayer2);
   }
 
   Color::Color color = connectToServer();
@@ -199,7 +204,17 @@ void MainWidget::keyReleaseEvent(QKeyEvent* event)
 void MainWidget::startGame()
 {
   m_running = true;
-  m_sirenPlayer->play();
+  startPlayer1();
+}
+
+void MainWidget::startPlayer1()
+{
+  m_sirenPlayer1->play(Sound::Ambient);
+}
+
+void MainWidget::startPlayer2()
+{
+  m_sirenPlayer2->play(Sound::Ambient);
 }
 
 void MainWidget::playerScoreClicked()
diff --git a/pacman-c++/mainwidget.h b/pacman-c++/mainwidget.h
index a3cde3d..cbc195e 100644
--- a/pacman-c++/mainwidget.h
+++ b/pacman-c++/mainwidget.h
@@ -30,6 +30,8 @@ private slots:
   void playerScoreClicked();
   void tick();
   void sendKeyUpdate();
+  void startPlayer1();
+  void startPlayer2();
 
 private:
   void createGui();
@@ -49,7 +51,8 @@ private:
 
   /* game running */
   bool m_running;
-  AudioPlayer *m_sirenPlayer;
+  AudioPlayer *m_sirenPlayer1;
+  AudioPlayer *m_sirenPlayer2;
 
   QTcpSocket *m_socket;
   SceneHolder *m_scene;