mice optimizations

Victor-Haefner · May 15, 2024 · 57dff23 · 57dff23
1 parent 649b723
commit 57dff23
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 8 deletions.
diff --git a/src/core/networking/VRNetworkClient.h b/src/core/networking/VRNetworkClient.h
@@ -44,6 +44,7 @@ class VRNetworkClient : public std::enable_shared_from_this<VRNetworkClient> {
 
         virtual void onMessage( function<string(string)> f ) {};
         virtual void connect(string host, int port) {};
+        virtual bool isConnected(string host, int port) { return false; };
         virtual void send(const string& message, string guard = "", bool verbose = false) {};
 
         string getName();

diff --git a/src/core/networking/mqtt/VRMQTTClient.cpp b/src/core/networking/mqtt/VRMQTTClient.cpp
@@ -170,14 +170,16 @@ void VRMQTTClient::disconnect() {
     if (s) s->queueJob(f, 0, 60); // delay in N frames
 }
 
+bool VRMQTTClient::isConnected(string host, int port) { return bool("mqtt://"+host+":"+toString(port) == uri); }
+
 void VRMQTTClient::connect(string host, int port) { // connect("broker.hivemq.com", 1883)
     //cout << "VRMQTTClient::connect " << this << endl;
     if (data->connecting) return;
     if (data->mqttConnected) return;
     data->connecting = true;
 
-    string address = "mqtt://"+host+":"+toString(port);
-    data->s_url = address;
+    uri = "mqtt://"+host+":"+toString(port);
+    data->s_url = uri;
 
     mg_mqtt_opts opts = data->basicOpts();
     opts.clean = true;

diff --git a/src/core/networking/mqtt/VRMQTTClient.h b/src/core/networking/mqtt/VRMQTTClient.h
@@ -31,6 +31,7 @@ class VRMQTTClient : public VRNetworkClient {
 
         void disconnect();
         void connect(string host, int port) override;
+        bool isConnected(string host, int port) override;
         void onMessage( function<string(string)> f ) override;
 
         bool connected();

diff --git a/src/core/networking/tcp/VRTCPClient.cpp b/src/core/networking/tcp/VRTCPClient.cpp
@@ -145,7 +145,12 @@ class TCPClient {
         }
 
         void runService() { // needed because windows complains..
-            io_service.run();
+            try {
+                io_service.run();
+            } catch(...) {
+                cout << "Error in TCPClient::runService!" << endl;
+                runService();
+            }
         }
 
     public:
@@ -171,7 +176,7 @@ class TCPClient {
                 boost::system::error_code _error_code;
                 socket->shutdown(tcp::socket::shutdown_both, _error_code);
             } catch(...) {
-                ;
+                cout << "Error in TCPClient::close!" << endl;
             }
 
             cout << "join service thread" << endl;
@@ -377,6 +382,7 @@ VRTCPClientPtr VRTCPClient::create(string name) {
 }
 
 void VRTCPClient::connect(string host, int port) { client->connect(host, port); uri = host+":"+toString(port); }
+bool VRTCPClient::isConnected(string host, int port) { return bool(host+":"+toString(port) == uri); }
 void VRTCPClient::connect(string host) { client->connect(host); uri = host; }
 void VRTCPClient::setGuard(string guard) { client->setGuard(guard); }
 void VRTCPClient::send(const string& message, string guard, bool verbose) { client->send(message, guard, verbose); }

diff --git a/src/core/networking/tcp/VRTCPClient.h b/src/core/networking/tcp/VRTCPClient.h
@@ -23,6 +23,7 @@ class VRTCPClient : public VRNetworkClient {
         void setGuard( string g );
 
         void connect(string host, int port) override;
+        bool isConnected(string host, int port) override;
         void connect(string uri);
         void connectToPeer(int localPort, string remoteIP, int remotePort);
         void send(const string& message, string guard = "", bool verbose = false) override;

diff --git a/src/core/networking/udp/VRUDPClient.cpp b/src/core/networking/udp/VRUDPClient.cpp
@@ -184,4 +184,5 @@ VRUDPClientPtr VRUDPClient::create(string name) {
 
 void VRUDPClient::onMessage( function<string(string)> f ) { client->onMessage(f); }
 void VRUDPClient::connect(string host, int port) { client->connect(host, port); uri = host+":"+toString(port); }
+bool VRUDPClient::isConnected(string host, int port) { return bool(host+":"+toString(port) == uri); }
 void VRUDPClient::send(const string& message, string guard, bool verbose) { client->send(message+guard, verbose); }
diff --git a/src/core/networking/udp/VRUDPClient.h b/src/core/networking/udp/VRUDPClient.h
@@ -22,6 +22,7 @@ class VRUDPClient : public VRNetworkClient {
         void onMessage( function<string(string)> f ) override;
 
         void connect(string host, int port) override;
+        bool isConnected(string host, int port) override;
         void send(const string& message, string guard = "", bool verbose = false) override;
 };
 

diff --git a/src/core/scene/sound/VRMicrophone.cpp b/src/core/scene/sound/VRMicrophone.cpp
@@ -160,8 +160,11 @@ using duration = std::chrono::duration<T, std::milli>;
 }*/
 
 void VRMicrophone::startRecordingThread() {
+    if (recording) return;
+
     auto recordCb = [&]() {
         recording = true;
+        cout << "VRMicrophone::startRecordingThread" << endl;
 
         while (doStream) {
             auto frame = fetchDevicePacket();
@@ -188,8 +191,11 @@ void VRMicrophone::startRecordingThread() {
 }
 
 void VRMicrophone::startStreamingThread(string method) {
+    if (streaming) return;
+
     auto streamCb = [&](string method) {
         streaming = true;
+        cout << "VRMicrophone::startStreamingThread" << endl;
 
         while (doStream) {
             bool enoughInitialQueuedFrames = bool(queuedFrames >= queueSize);
@@ -232,8 +238,8 @@ void VRMicrophone::startStreamingOver(VRNetworkClientPtr client, string method)
     doStream = true;
     recordingSound->addOutStreamClient(client, method);
 
-    if (!recording) startRecordingThread();
-    if (!streaming) startStreamingThread(method);
+    startRecordingThread();
+    startStreamingThread(method);
 }
 
 void VRMicrophone::startStreaming(string address, int port, string method) {
@@ -242,8 +248,8 @@ void VRMicrophone::startStreaming(string address, int port, string method) {
     doStream = true;
     recordingSound->setupOutStream(address, port, method);
 
-    if (!recording) startRecordingThread();
-    if (!streaming) startStreamingThread(method);
+    startRecordingThread();
+    startStreamingThread(method);
 }
 
 bool VRMicrophone::isStreaming() { return doStream; }

diff --git a/src/core/scene/sound/VRSound.cpp b/src/core/scene/sound/VRSound.cpp
@@ -874,6 +874,7 @@ bool VRSound::addOutStreamClient(VRNetworkClientPtr client, string method) {
 }
 
 bool VRSound::setupOutStream(string url, int port, string method) { // TODO: make a udpClients map instead of vector
+    for (auto c : udpClients) if (c->isConnected(url, port)) return true;
     auto cli = VRUDPClient::create("sound-out");
     cli->connect(url, port);
     return addOutStreamClient(cli, method);