more

apps/LoopThroughWithOpenGLCompositing/control/ControlServices.cpp

@@ -3,7 +3,6 @@
 #include "ControlServer.h"
 #include "OscServer.h"
 #include "RuntimeControlBridge.h"
-#include "RuntimeHost.h"
 #include "RuntimeStore.h"
 #include <windows.h>
 
@@ -22,11 +21,11 @@ ControlServices::~ControlServices()
 	Stop();
 }
 
-bool ControlServices::Start(OpenGLComposite& composite, RuntimeHost& runtimeHost, std::string& error)
+bool ControlServices::Start(OpenGLComposite& composite, RuntimeStore& runtimeStore, std::string& error)
 {
 	Stop();
 
-	if (!StartControlServicesBoundary(composite, runtimeHost, *this, *mControlServer, *mOscServer, error))
+	if (!StartControlServicesBoundary(composite, runtimeStore, *this, *mControlServer, *mOscServer, error))
 	{
 		Stop();
 		return false;

apps/LoopThroughWithOpenGLCompositing/control/ControlServices.h

@@ -14,7 +14,6 @@
 class ControlServer;
 class OpenGLComposite;
 class OscServer;
-class RuntimeHost;
 class RuntimeStore;
 
 struct RuntimePollEvents
@@ -45,7 +44,7 @@ public:
 	ControlServices();
 	~ControlServices();
 
-	bool Start(OpenGLComposite& composite, RuntimeHost& runtimeHost, std::string& error);
+	bool Start(OpenGLComposite& composite, RuntimeStore& runtimeStore, std::string& error);
 	void BeginPolling(RuntimeStore& runtimeStore);
 	void Stop();
 	void BroadcastState();

apps/LoopThroughWithOpenGLCompositing/control/RuntimeControlBridge.cpp

@@ -4,11 +4,11 @@
 #include "ControlServer.h"
 #include "OpenGLComposite.h"
 #include "OscServer.h"
-#include "RuntimeHost.h"
+#include "RuntimeStore.h"
 
 bool StartControlServicesBoundary(
 	OpenGLComposite& composite,
-	RuntimeHost& runtimeHost,
+	RuntimeStore& runtimeStore,
 	ControlServices& controlServices,
 	ControlServer& controlServer,
 	OscServer& oscServer,
@@ -38,15 +38,16 @@ bool StartControlServicesBoundary(
 		return true;
 	};
 
-	if (!controlServer.Start(runtimeHost.GetUiRoot(), runtimeHost.GetDocsRoot(), runtimeHost.GetServerPort(), callbacks, error))
+	if (!controlServer.Start(runtimeStore.GetRuntimeUiRoot(), runtimeStore.GetRuntimeDocsRoot(), runtimeStore.GetConfiguredControlServerPort(), callbacks, error))
 		return false;
-	runtimeHost.SetServerPort(controlServer.GetPort());
+	runtimeStore.SetBoundControlServerPort(controlServer.GetPort());
 
 	OscServer::Callbacks oscCallbacks;
 	oscCallbacks.updateParameter = [&controlServices](const std::string& layerKey, const std::string& parameterKey, const std::string& valueJson, std::string& actionError) {
 		return controlServices.QueueOscUpdate(layerKey, parameterKey, valueJson, actionError);
 	};
-	if (runtimeHost.GetOscPort() > 0 && !oscServer.Start(runtimeHost.GetOscBindAddress(), runtimeHost.GetOscPort(), oscCallbacks, error))
+	if (runtimeStore.GetConfiguredOscPort() > 0 &&
+		!oscServer.Start(runtimeStore.GetConfiguredOscBindAddress(), runtimeStore.GetConfiguredOscPort(), oscCallbacks, error))
 		return false;
 
 	return true;

apps/LoopThroughWithOpenGLCompositing/control/RuntimeControlBridge.h

@@ -6,11 +6,11 @@ class ControlServer;
 class ControlServices;
 class OpenGLComposite;
 class OscServer;
-class RuntimeHost;
+class RuntimeStore;
 
 bool StartControlServicesBoundary(
 	OpenGLComposite& composite,
-	RuntimeHost& runtimeHost,
+	RuntimeStore& runtimeStore,
 	ControlServices& controlServices,
 	ControlServer& controlServer,
 	OscServer& oscServer,

apps/LoopThroughWithOpenGLCompositing/control/RuntimeServices.cpp

@@ -12,9 +12,9 @@ RuntimeServices::~RuntimeServices()
 	Stop();
 }
 
-bool RuntimeServices::Start(OpenGLComposite& composite, RuntimeHost& runtimeHost, std::string& error)
+bool RuntimeServices::Start(OpenGLComposite& composite, RuntimeStore& runtimeStore, std::string& error)
 {
-	return mControlServices && mControlServices->Start(composite, runtimeHost, error);
+	return mControlServices && mControlServices->Start(composite, runtimeStore, error);
 }
 
 void RuntimeServices::BeginPolling(RuntimeStore& runtimeStore)

apps/LoopThroughWithOpenGLCompositing/control/RuntimeServices.h

@@ -5,7 +5,6 @@
 #include <memory>
 #include <string>
 class OpenGLComposite;
-class RuntimeHost;
 class RuntimeStore;
 
 class RuntimeServices
@@ -17,7 +16,7 @@ public:
 	RuntimeServices();
 	~RuntimeServices();
 
-	bool Start(OpenGLComposite& composite, RuntimeHost& runtimeHost, std::string& error);
+	bool Start(OpenGLComposite& composite, RuntimeStore& runtimeStore, std::string& error);
 	void BeginPolling(RuntimeStore& runtimeStore);
 	void Stop();
 	void BroadcastState();