legacy code cleanup

src/video/decklink/DeckLinkSession.h

@@ -11,28 +11,28 @@
 
 #include <atlbase.h>
 #include <deque>
+#include <functional>
 #include <mutex>
 #include <string>
 #include <unordered_map>
 
 class OpenGLComposite;
 
-class DeckLinkSession : public VideoIODevice
+class DeckLinkSession
 {
 public:
 	DeckLinkSession() = default;
 	~DeckLinkSession();
 
-	void ReleaseResources() override;
-	bool DiscoverDevicesAndModes(const VideoFormatSelection& videoModes, std::string& error) override;
-	bool SelectPreferredFormats(const VideoFormatSelection& videoModes, bool outputAlphaRequired, std::string& error) override;
-	bool ConfigureInput(InputFrameCallback callback, const VideoFormat& inputVideoMode, std::string& error) override;
-	bool ConfigureOutput(OutputFrameCallback callback, const VideoFormat& outputVideoMode, bool externalKeyingEnabled, std::string& error) override;
-	bool PrepareOutputSchedule() override;
-	bool StartInputStreams() override;
-	bool StartScheduledPlayback() override;
-	bool Start() override;
-	bool Stop() override;
+	using OutputFrameCallback = std::function<void(const VideoIOCompletion&)>;
+
+	void ReleaseResources();
+	bool DiscoverDevicesAndModes(const VideoFormatSelection& videoModes, std::string& error);
+	bool SelectPreferredFormats(const VideoFormatSelection& videoModes, bool outputAlphaRequired, std::string& error);
+	bool ConfigureOutput(OutputFrameCallback callback, const VideoFormat& outputVideoMode, bool externalKeyingEnabled, std::string& error);
+	bool PrepareOutputSchedule();
+	bool StartScheduledPlayback();
+	bool Stop();
 
 	bool HasInputDevice() const { return mState.hasInputDevice; }
 	bool HasInputSource() const { return mState.hasInputSource; }
@@ -61,14 +61,13 @@ public:
 	bool ExternalKeyingActive() const { return mState.externalKeyingActive; }
 	const std::string& StatusMessage() const { return mState.statusMessage; }
 	void SetStatusMessage(const std::string& message) { mState.statusMessage = message; }
-	const VideoIOState& State() const override { return mState; }
-	VideoIOState& MutableState() override { return mState; }
+	const VideoIOState& State() const { return mState; }
+	VideoIOState& MutableState() { return mState; }
 	double FrameBudgetMilliseconds() const;
-	VideoPlayoutRecoveryDecision AccountForCompletionResult(VideoIOCompletionResult completionResult, uint64_t readyQueueDepth) override;
-	bool BeginOutputFrame(VideoIOOutputFrame& frame) override;
-	void EndOutputFrame(VideoIOOutputFrame& frame) override;
-	bool ScheduleOutputFrame(const VideoIOOutputFrame& frame) override;
-	void HandleVideoInputFrame(IDeckLinkVideoInputFrame* inputFrame, bool hasNoInputSource);
+	VideoPlayoutRecoveryDecision AccountForCompletionResult(VideoIOCompletionResult completionResult, uint64_t readyQueueDepth);
+	bool BeginOutputFrame(VideoIOOutputFrame& frame);
+	void EndOutputFrame(VideoIOOutputFrame& frame);
+	bool ScheduleOutputFrame(const VideoIOOutputFrame& frame);
 	void HandlePlayoutFrameCompleted(IDeckLinkVideoFrame* completedFrame, BMDOutputFrameCompletionResult completionResult);
 
 private:
@@ -83,9 +82,7 @@ private:
 	void RefreshBufferedVideoFrameCount();
 	static VideoIOCompletionResult TranslateCompletionResult(BMDOutputFrameCompletionResult completionResult);
 
-	CComPtr<CaptureDelegate>				captureDelegate;
 	CComPtr<PlayoutDelegate>				playoutDelegate;
-	CComPtr<IDeckLinkInput>					input;
 	CComPtr<IDeckLinkOutput>				output;
 	CComPtr<IDeckLinkKeyer>					keyer;
 	std::deque<CComPtr<IDeckLinkMutableVideoFrame>> outputVideoFrameQueue;
@@ -97,6 +94,5 @@ private:
 	bool									mScheduleRealignmentPending = false;
 	bool									mScheduleRealignmentArmed = true;
 	bool									mProactiveScheduleRealignmentArmed = true;
-	InputFrameCallback						mInputFrameCallback;
 	OutputFrameCallback						mOutputFrameCallback;
 };