Blinker

@@ -89,6 +89,36 @@

       No frames are sent when the game is inactive (i.e. no player has

       joined yet).

     </p>

+    <h3>Sound Names</h3>

+    <p>

+      It is possible to request playing a sound on certain events occuring

+      during the game.

+      The names of the sounds to play are configurable via the following

+      files:

+      <table>

+        <tr><td><b>file name</b></td>

+            <td width="2em"></td>

+            <td><b>play sound on event</b></td></tr>

+        <tr><td><code>leftPlayerSound</code></td>

+            <td></td>

+            <td>player entered the game as left player</td></tr>

+        <tr><td><code>rightPlayerSound</code></td>

+            <td></td>

+            <td>player entered the game as right player</td></tr>

+        <tr><td><code>scoreSound</code></td>

+            <td></td>

+            <td>player scored a goal</td></tr>

+        <tr><td><code>otherScoreSound</code></td>

+            <td></td>

+            <td>other player scored a goal</td></tr>

+        <tr><td><code>winSound</code></td>

+            <td></td>

+            <td>player wins game</td></tr>

+        <tr><td><code>looseSound</code></td>

+            <td></td>

+            <td>player looses game</td></tr>

+      </table>

+    </p>

     <h2>Operator Connection Interfaces</h2>

     <p>

     The name of the operator connection interfaces provided by this module

@@ -0,0 +1 @@

+pongPlayerLeft

@@ -0,0 +1 @@

+pongLose

@@ -0,0 +1 @@

+pongOtherScore

@@ -0,0 +1 @@

+pongPlayerRight

@@ -0,0 +1 @@

+pongScore

@@ -0,0 +1 @@

+pongWin

@@ -369,6 +369,14 @@ void Game::valueFromFile(UIntFile &valueFile, ValueDescr const &descr,

   }

 }

+/// process update of sound name file

+void Game::soundUpdate(NameFile &soundFile)

+{

+  if (soundFile.checkModified()) {

+    soundFile.update();

+  }

+}

+

 /// send current image buffer as frame to output stream

 void Game::sendFrame()

 {

@@ -186,6 +186,9 @@ protected:

   static void valueFromFile(UIntFile &valueFile, ValueDescr const &descr,

                             unsigned int &value);

+  /// process update of sound name file

+  static void soundUpdate(NameFile &soundFile);

+

   /// send current image buffer as frame to output stream

   void sendFrame();

@@ -16,6 +16,7 @@

 #include "Game.h"

 #include "Mgrs.h"

 #include "Module.h"

+#include "NameFile.h"

 #include "OpConn.h"

 #include "OpConnIf.h"

 #include "OpReqIf.h"

@@ -53,6 +54,12 @@ Pong::Pong(const std::string &name, Mgrs &mgrs, const Directory &dirBase):

   m_fileGoalColor(dirBase.getFile("goalColor")),

   m_fileDelay(dirBase.getFile("delay")),

   m_fileMaxScore(dirBase.getFile("maxScore")),

+  m_fileLeftPlayerSound(dirBase.getFile("leftPlayerSound")),

+  m_fileRightPlayerSound(dirBase.getFile("rightPlayerSound")),

+  m_fileScoreSound(dirBase.getFile("scoreSound")),

+  m_fileOtherScoreSound(dirBase.getFile("otherScoreSound")),

+  m_fileWinSound(dirBase.getFile("winSound")),

+  m_fileLoseSound(dirBase.getFile("loseSound")),

   m_ballColor(), m_lineColor(), m_padColor(), m_computerColor(),

   m_scoreColor(), m_goalColor(),

   m_delay(c_delayDescr.default_), m_maxScore(c_maxScoreDescr.default_),

@@ -101,6 +108,14 @@ bool Pong::updateConfigGame()

     ret = true;

   }

+  // sound name file was modified -> re-read sound name, no other update needed

+  soundUpdate(m_fileLeftPlayerSound);

+  soundUpdate(m_fileRightPlayerSound);

+  soundUpdate(m_fileScoreSound);

+  soundUpdate(m_fileOtherScoreSound);

+  soundUpdate(m_fileWinSound);

+  soundUpdate(m_fileLoseSound);

+

   return ret;

 }

@@ -135,10 +150,12 @@ void Pong::newOpConn(const std::string &name, OpConn *pConn)

   // left player joins if none there yet

   if (name == m_name + c_opConnSuffixLeft && ! m_pConnLeft) {

     m_pConnLeft = pConn;

+    requestOpConnSound(m_pConnLeft, m_fileLeftPlayerSound);

   }

   // right player joins if none there yet

   else if (name == m_name + c_opConnSuffixRight && ! m_pConnRight) {

     m_pConnRight = pConn;

+    requestOpConnSound(m_pConnRight, m_fileRightPlayerSound);

   }

   // close imcoming connection as soon as possible, nothing else happens

   else {

@@ -572,12 +589,28 @@ void Pong::detectGoal()

   if (m_ballPosX == 0) {

     m_goalDelay = goalDelay;

     ++m_scoreRight;

+    // play sound - score or win

+    if (m_scoreRight >= (int)m_maxScore) {

+      playOpConnSound(m_pConnRight, m_fileWinSound);

+      playOpConnSound(m_pConnLeft, m_fileLoseSound);

+    } else {

+      playOpConnSound(m_pConnRight, m_fileScoreSound);

+      playOpConnSound(m_pConnLeft, m_fileOtherScoreSound);

+    }

   }

   // ball at far right - goal for left player

   else if (m_ballPosX == m_width - 1) {

     m_goalDelay = goalDelay;

     ++m_scoreLeft;

+    // play sound - score or win

+    if (m_scoreLeft >= (int)m_maxScore) {

+      playOpConnSound(m_pConnLeft, m_fileWinSound);

+      playOpConnSound(m_pConnRight, m_fileLoseSound);

+    } else {

+      playOpConnSound(m_pConnLeft, m_fileScoreSound);

+      playOpConnSound(m_pConnRight, m_fileOtherScoreSound);

+    }

   }

 }

@@ -19,6 +19,7 @@

 #include "Game.h"

 #include "Mgrs.h"

 #include "Module.h"

+#include "NameFile.h"

 #include "OpConn.h"

 #include "OpConnIf.h"

 #include "OpReqIf.h"

@@ -186,6 +187,13 @@ protected:

   UIntFile  m_fileDelay;         ///< file for initial delay in ms per frame

   UIntFile  m_fileMaxScore;      ///< file for maximum score (end of game)

+  NameFile m_fileLeftPlayerSound;  ///< "left player" sound name file

+  NameFile m_fileRightPlayerSound; ///< "right player" sound name file

+  NameFile m_fileScoreSound;       ///< "you scored" sound name file

+  NameFile m_fileOtherScoreSound;  ///< "other player scored" sound name file

+  NameFile m_fileWinSound;         ///< "you win" sound name file

+  NameFile m_fileLoseSound;        ///< "you lose" sound name file

+

   ColorData    m_ballColor;     ///< ball color

   ColorData    m_lineColor;     ///< center line color

   ColorData    m_padColor;      ///< phone player pad color