fix cluster mode

todo: fix startup issue

Author: uwewoessner

src/OpenCOVER/audio/Audio.cpp

@@ -61,6 +61,13 @@ void Audio::loadFile()
     ALvoid *sample = alutLoadMemoryFromFile(_url.c_str(), &format, &size, &frequency);
     if (sample == nullptr)
     {
+    // Check for ALUT errors
+	 ALenum error = alutGetError();
+	 if (error != ALUT_ERROR_NO_ERROR) {
+	     // Print the error description
+	     printf("ALUT Error: %s\n", alutGetErrorString(error));
+	     return;
+	 }
         return;
     }
 

src/OpenCOVER/audio/Makefile

@@ -0,0 +1,4 @@
+include $(COVISEDIR)/src/Makefile.default
+
+bundle:
+	cd $(BUILDDIR) && make bundle

src/OpenCOVER/audio/Player.cpp

@@ -101,8 +101,8 @@ bool Source::isPlaying()
     return playing;
 }
 
-Player::Player(const Listener *listener)
-    : listener(listener)
+Player::Player(const Listener *listener, bool isMaster)
+    : listener(listener), isMaster(isMaster)
 {
 }
 
@@ -114,7 +114,7 @@ void Player::update()
     }
 }
 
-Player *Player::createPlayer(Listener *listener, const std::string &type)
+Player *Player::createPlayer(Listener *listener, const std::string &type, bool isMa)
 {
 #ifdef HAVE_AUDIO
     if (type.empty())
@@ -128,12 +128,12 @@ Player *Player::createPlayer(Listener *listener, const std::string &type)
         // config file and parse it itself.
         std::string host = coCoviseConfig::getEntry("value", "COVER.Audio.Host", "localhost");
         int port = coCoviseConfig::getInt("port", "COVER.Audio.Host", 31231);
-
-        return new PlayerAServer(listener, host, port);
+        return new PlayerAServer(listener, host, port, isMa);
     }
     else if (boost::iequals(type, "openal"))
     {
-        return new PlayerOpenAL(listener);
+        return new PlayerOpenAL(listener,isMa);
+	
     }
     else if (boost::iequals(type, "none"))
     {

src/OpenCOVER/audio/Player.h

@@ -70,14 +70,15 @@ class COVRAUDIOEXPORT Player
     friend class Source;
 
 public:
-    Player(const Listener *listener);
+    Player(const Listener *listener, bool isMaster);
     virtual void update();
     virtual std::unique_ptr<Source> makeSource(const Audio *);
 
-    static Player *createPlayer(Listener *listener, const std::string &type);
+    static Player *createPlayer(Listener *listener, const std::string &type, bool isMaster);
 
 protected:
     const Listener *listener;
+    bool isMaster;
 
     std::set<Source *> sources;
     void registerSource(Source *source);

src/OpenCOVER/audio/PlayerAServer.cpp

@@ -41,8 +41,8 @@ inline int errno_sys()
 #endif
 }
 
-PlayerAServer::PlayerAServer(const Listener *listener, const std::string &host, int port)
-    : Player(listener)
+PlayerAServer::PlayerAServer(const Listener *listener, const std::string &host, int port, bool isMaster)
+    : Player(listener,isMaster)
     , asFd(-1)
     , asHost(host)
     , asPort(port)
@@ -57,6 +57,14 @@ PlayerAServer::PlayerAServer(const Listener *listener, const std::string &host,
 
 void PlayerAServer::connect()
 {
+    cerr << "AServer::connect()" << endl;
+    if (!isMaster)
+    {
+        asFd = -1;
+    cerr << "AServer::connect() not Master" << endl;
+        return;
+    }
+    cerr << "AServer::connect()2" << endl;
     if (asHost.empty() || asPort <= 0)
     {
         CERR << "audio server not configured" << endl;

src/OpenCOVER/audio/PlayerAServer.h

@@ -18,7 +18,7 @@ class Listener;
 class COVRAUDIOEXPORT PlayerAServer : public Player
 {
 public:
-    PlayerAServer(const Listener *listener, const std::string &host, int port);
+    PlayerAServer(const Listener *listener, const std::string &host, int port, bool isMaster);
     virtual ~PlayerAServer();
     virtual std::unique_ptr<opencover::audio::Source> makeSource(const Audio *audio) override;
 

src/OpenCOVER/audio/PlayerOpenAL.cpp

@@ -20,8 +20,8 @@ using namespace opencover::audio;
 #include <iostream>
 #include <glm/gtx/string_cast.hpp>
 
-PlayerOpenAL::PlayerOpenAL(const Listener *listener)
-    : Player(listener)
+PlayerOpenAL::PlayerOpenAL(const Listener *listener, bool isMaster)
+    : Player(listener, isMaster)
 {
     alDistanceModel(AL_NONE);
     alDopplerVelocity(343000); // everything is in millimeters :(

src/OpenCOVER/audio/PlayerOpenAL.h

@@ -21,7 +21,7 @@ namespace opencover::audio
 class COVRAUDIOEXPORT PlayerOpenAL : public Player
 {
 public:
-    PlayerOpenAL(const Listener *listener);
+    PlayerOpenAL(const Listener *listener, bool isMaster);
     virtual void update();
 
     virtual std::unique_ptr<opencover::audio::Source> makeSource(const Audio *audio);

src/OpenCOVER/cover/coVRPluginSupport.cpp

@@ -905,7 +905,7 @@ coVRPluginSupport::coVRPluginSupport()
 
     // Setup audio subsystem
     std::string audioPlayerType = coCoviseConfig::getEntry("value", "COVER.Plugin.Vrml97.Audio", "none");
-    player = audio::Player::createPlayer(&listener, audioPlayerType);
+    player = audio::Player::createPlayer(&listener, audioPlayerType, coVRMSController::instance()->isMaster());
 
     pointerButton = NULL;
     mouseButton = NULL;