Blinker

@@ -3,6 +3,7 @@

    Copyleft GNU public license - http://www.gnu.org/copyleft/gpl.html

    a blinkenarea.org project */

+#include <map>

 #include <set>

 #include <sstream>

 #include <string>

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

 #include "Game.h"

 #include "Mgrs.h"

 #include "Module.h"

+#include "NameFile.h"

 #include "OutStreamFile.h"

 #include "UIntFile.h"

@@ -33,7 +35,7 @@ Game::Game(const std::string &name, Mgrs &mgrs, const Directory &dirBase):

   m_fileBackgroundColor(dirBase.getFile("backgroundColor")),

   m_fileOutStream(dirBase.getFile("outstream"), mgrs.m_streamMgr),

   m_height(0), m_width(0), m_channels(0), m_imgBuf(), m_backgroundColor(),

-  m_haveTimeStep(false), m_timeStepTime(), m_opConnsClose()

+  m_haveTimeStep(false), m_timeStepTime(), m_opConnSounds(), m_opConnsClose()

 {

 }

@@ -88,6 +90,12 @@ void Game::updateConfig()

 /// callback when requested time reached

 void Game::timeCall()

 {

+  // play sounds on operator connections

+  for (auto & opConnSound : m_opConnSounds) {

+    playOpConnSound(opConnSound.first, *opConnSound.second);

+  }

+  m_opConnSounds.clear();

+

   // close operator connections

   for (OpConn *pConn : m_opConnsClose) {

     pConn->close();

@@ -395,6 +403,22 @@ void Game::unsetTimeStep()

   planTimeCall();

 }

+/// play a sound on operator connection (NULL ok) (direct)

+void Game::playOpConnSound(OpConn *pConn, NameFile const &soundFile)

+{

+  if (pConn && soundFile.m_valid) {

+    pConn->sendPlay(soundFile.m_obj.m_str);

+  }

+}

+

+//// request playing a sound on operator connection (NULL ok) (via time call)

+void Game::requestOpConnSound(OpConn *pConn, NameFile const &soundFile)

+{

+  if (pConn) {

+    m_opConnSounds[pConn] = &soundFile;

+  }

+}

+

 /// request closing operator connection (NULL ok) (closed via time call)

 void Game::requestOpConnClose(OpConn *pConn)

 {

@@ -407,6 +431,7 @@ void Game::requestOpConnClose(OpConn *pConn)

 /// remove operator connection from requests (call when op conn is closed)

 void Game::forgetOpConn(OpConn *pConn)

 {

+  m_opConnSounds.erase(pConn);

   m_opConnsClose.erase(pConn);

   planTimeCall();

 }

@@ -450,7 +475,7 @@ void Game::destroyImgBuf()

 void Game::planTimeCall()

 {

   // request immediate time call if there are internal time-based actions

-  if (! m_opConnsClose.empty()) {

+  if (! m_opConnSounds.empty() || ! m_opConnsClose.empty()) {

     m_mgrs.m_callMgr.requestTimeCall(this, Time::now());

     return;

   }

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

 #ifndef BLINKER_GAME_H

 #define BLINKER_GAME_H

+#include <map>

 #include <set>

 #include <string>

 #include <vector>

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

 #include "FormatFile.h"

 #include "Mgrs.h"

 #include "Module.h"

+#include "NameFile.h"

 #include "OpConn.h"

 #include "OutStreamFile.h"

 #include "Time.h"

@@ -45,6 +47,9 @@ private:

   /// set of operator connections

   typedef std::set<OpConn *> OpConnSet;

+  /// sound (via sound name file) to play on operator connections

+  typedef std::map<OpConn *, NameFile const *> OpConnSounds;

+

 public:

   /**

    * @brief constructor

@@ -190,6 +195,12 @@ protected:

   /// unset game time step - do timed action for game

   void unsetTimeStep();

+  /// play a sound on operator connection (NULL ok) (direct)

+  void playOpConnSound(OpConn *pConn, NameFile const &soundFile);

+

+  //// request playing a sound on operator connection (NULL ok) (via time call)

+  void requestOpConnSound(OpConn *pConn, NameFile const &soundFile);

+

   /// request closing operator connection (NULL ok) (closed via time call)

   void requestOpConnClose(OpConn *pConn);

@@ -219,6 +230,7 @@ protected:

 private:

   bool         m_haveTimeStep; ///< if a time step is pending

   Time         m_timeStepTime; ///< time of next time step

+  OpConnSounds m_opConnSounds; ///< sound to play on operator connections

   OpConnSet    m_opConnsClose; ///< operator connections to be closed

 }; // class Canvas