further phase 1
This commit is contained in:
@@ -35,9 +35,9 @@ bool ControlServices::Start(OpenGLComposite& composite, RuntimeHost& runtimeHost
|
||||
return true;
|
||||
}
|
||||
|
||||
void ControlServices::BeginPolling(RuntimeHost& runtimeHost, RuntimeStore& runtimeStore)
|
||||
void ControlServices::BeginPolling(RuntimeStore& runtimeStore)
|
||||
{
|
||||
StartPolling(runtimeHost, runtimeStore);
|
||||
StartPolling(runtimeStore);
|
||||
}
|
||||
|
||||
void ControlServices::Stop()
|
||||
@@ -175,12 +175,12 @@ RuntimePollEvents ControlServices::ConsumePollEvents()
|
||||
return events;
|
||||
}
|
||||
|
||||
void ControlServices::StartPolling(RuntimeHost& runtimeHost, RuntimeStore& runtimeStore)
|
||||
void ControlServices::StartPolling(RuntimeStore& runtimeStore)
|
||||
{
|
||||
if (mPollRunning.exchange(true))
|
||||
return;
|
||||
|
||||
mPollThread = std::thread([this, &runtimeHost, &runtimeStore]() { PollLoop(runtimeHost, runtimeStore); });
|
||||
mPollThread = std::thread([this, &runtimeStore]() { PollLoop(runtimeStore); });
|
||||
}
|
||||
|
||||
void ControlServices::StopPolling()
|
||||
@@ -192,7 +192,7 @@ void ControlServices::StopPolling()
|
||||
mPollThread.join();
|
||||
}
|
||||
|
||||
void ControlServices::PollLoop(RuntimeHost& runtimeHost, RuntimeStore& runtimeStore)
|
||||
void ControlServices::PollLoop(RuntimeStore& runtimeStore)
|
||||
{
|
||||
while (mPollRunning)
|
||||
{
|
||||
@@ -226,7 +226,7 @@ void ControlServices::PollLoop(RuntimeHost& runtimeHost, RuntimeStore& runtimeSt
|
||||
bool registryChanged = false;
|
||||
bool reloadRequested = false;
|
||||
std::string runtimeError;
|
||||
if (!runtimeHost.PollFileChanges(registryChanged, reloadRequested, runtimeError))
|
||||
if (!runtimeStore.PollStoredFileChanges(registryChanged, reloadRequested, runtimeError))
|
||||
{
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(mPollErrorMutex);
|
||||
|
||||
@@ -46,7 +46,7 @@ public:
|
||||
~ControlServices();
|
||||
|
||||
bool Start(OpenGLComposite& composite, RuntimeHost& runtimeHost, std::string& error);
|
||||
void BeginPolling(RuntimeHost& runtimeHost, RuntimeStore& runtimeStore);
|
||||
void BeginPolling(RuntimeStore& runtimeStore);
|
||||
void Stop();
|
||||
void BroadcastState();
|
||||
void RequestBroadcastState();
|
||||
@@ -74,9 +74,9 @@ private:
|
||||
uint64_t generation = 0;
|
||||
};
|
||||
|
||||
void StartPolling(RuntimeHost& runtimeHost, RuntimeStore& runtimeStore);
|
||||
void StartPolling(RuntimeStore& runtimeStore);
|
||||
void StopPolling();
|
||||
void PollLoop(RuntimeHost& runtimeHost, RuntimeStore& runtimeStore);
|
||||
void PollLoop(RuntimeStore& runtimeStore);
|
||||
|
||||
std::unique_ptr<ControlServer> mControlServer;
|
||||
std::unique_ptr<OscServer> mOscServer;
|
||||
|
||||
@@ -17,10 +17,10 @@ bool RuntimeServices::Start(OpenGLComposite& composite, RuntimeHost& runtimeHost
|
||||
return mControlServices && mControlServices->Start(composite, runtimeHost, error);
|
||||
}
|
||||
|
||||
void RuntimeServices::BeginPolling(RuntimeHost& runtimeHost, RuntimeStore& runtimeStore)
|
||||
void RuntimeServices::BeginPolling(RuntimeStore& runtimeStore)
|
||||
{
|
||||
if (mControlServices)
|
||||
mControlServices->BeginPolling(runtimeHost, runtimeStore);
|
||||
mControlServices->BeginPolling(runtimeStore);
|
||||
}
|
||||
|
||||
void RuntimeServices::Stop()
|
||||
|
||||
@@ -18,7 +18,7 @@ public:
|
||||
~RuntimeServices();
|
||||
|
||||
bool Start(OpenGLComposite& composite, RuntimeHost& runtimeHost, std::string& error);
|
||||
void BeginPolling(RuntimeHost& runtimeHost, RuntimeStore& runtimeStore);
|
||||
void BeginPolling(RuntimeStore& runtimeStore);
|
||||
void Stop();
|
||||
void BroadcastState();
|
||||
void RequestBroadcastState();
|
||||
|
||||
Reference in New Issue
Block a user