Clean up pass

apps/LoopThroughWithOpenGLCompositing/control/RuntimeServiceLiveBridge.cpp

@@ -1,10 +1,13 @@
 #include "RuntimeServiceLiveBridge.h"
 
+#include "RenderEngine.h"
 #include "RuntimeServices.h"
 
 #include <windows.h>
 
-void RuntimeServiceLiveBridge::DrainServiceEvents(RuntimeServices& runtimeServices, RenderEngine& renderEngine)
+namespace
+{
+void DrainServiceEvents(RuntimeServices& runtimeServices, RenderEngine& renderEngine)
 {
 	std::vector<RuntimeServices::AppliedOscUpdate> appliedOscUpdates;
 	std::vector<RuntimeServices::CompletedOscCommit> completedOscCommits;
@@ -31,7 +34,7 @@ void RuntimeServiceLiveBridge::DrainServiceEvents(RuntimeServices& runtimeServic
 	renderEngine.UpdateOscOverlayState(overlayUpdates, overlayCommitCompletions);
 }
 
-void RuntimeServiceLiveBridge::QueueServiceCommitRequests(
+void QueueServiceCommitRequests(
 	RuntimeServices& runtimeServices,
 	const std::vector<RenderEngine::OscOverlayCommitRequest>& commitRequests)
 {
@@ -51,6 +54,7 @@ void RuntimeServiceLiveBridge::QueueServiceCommitRequests(
 		}
 	}
 }
+}
 
 bool RuntimeServiceLiveBridge::PrepareLiveRenderLayerStates(
 	RuntimeServices& runtimeServices,

apps/LoopThroughWithOpenGLCompositing/control/RuntimeServiceLiveBridge.h

@@ -1,18 +1,15 @@
 #pragma once
 
-#include "RenderEngine.h"
+#include "ShaderTypes.h"
 
 #include <vector>
 
+class RenderEngine;
 class RuntimeServices;
 
 class RuntimeServiceLiveBridge
 {
 public:
-	static void DrainServiceEvents(RuntimeServices& runtimeServices, RenderEngine& renderEngine);
-	static void QueueServiceCommitRequests(
-		RuntimeServices& runtimeServices,
-		const std::vector<RenderEngine::OscOverlayCommitRequest>& commitRequests);
 	static bool PrepareLiveRenderLayerStates(
 		RuntimeServices& runtimeServices,
 		RenderEngine& renderEngine,

apps/LoopThroughWithOpenGLCompositing/gl/OpenGLComposite.cpp

@@ -1,12 +1,10 @@
 #include "DeckLinkDisplayMode.h"
 #include "OpenGLComposite.h"
 #include "GLExtensions.h"
-#include "GlRenderConstants.h"
 #include "PngScreenshotWriter.h"
 #include "RenderEngine.h"
 #include "RuntimeCoordinator.h"
 #include "RuntimeEventDispatcher.h"
-#include "RuntimeParameterUtils.h"
 #include "RuntimeServiceLiveBridge.h"
 #include "RuntimeServices.h"
 #include "RuntimeSnapshotProvider.h"
@@ -15,23 +13,15 @@
 #include "ShaderBuildQueue.h"
 #include "VideoBackend.h"
 
-#include <algorithm>
-#include <cctype>
 #include <chrono>
-#include <cmath>
 #include <ctime>
 #include <filesystem>
 #include <iomanip>
 #include <memory>
-#include <set>
 #include <sstream>
 #include <string>
 #include <vector>
 
-namespace
-{
-}
-
 OpenGLComposite::OpenGLComposite(HWND hWnd, HDC hDC, HGLRC hRC) :
 	hGLWnd(hWnd), hGLDC(hDC), hGLRC(hRC),
 	mScreenshotRequested(false)

apps/LoopThroughWithOpenGLCompositing/gl/RenderEngine.h

@@ -14,7 +14,6 @@
 #include <cstdint>
 #include <chrono>
 #include <functional>
-#include <map>
 #include <string>
 #include <vector>