瀏覽代碼

mac-decklink: Fix C++ virtual function warnings

Created another virtual function to override and moves stubbed function
to the header.
JohannMG 5 年之前
父節點
當前提交
41b12d7bff
共有 3 個文件被更改,包括 11 次插入4 次删除
  1. 5 1
      plugins/decklink/DecklinkBase.cpp
  2. 4 1
      plugins/decklink/DecklinkBase.h
  3. 2 2
      plugins/decklink/DecklinkInput.hpp

+ 5 - 1
plugins/decklink/DecklinkBase.cpp

@@ -15,4 +15,8 @@ bool DecklinkBase::Activate(DeckLinkDevice *, long long)
 	return false;
 }
 
-void DecklinkBase::Deactivate() {}
+bool DecklinkBase::Activate(DeckLinkDevice *, long long, BMDVideoConnection,
+			    BMDAudioConnection)
+{
+	return false;
+}

+ 4 - 1
plugins/decklink/DecklinkBase.h

@@ -27,7 +27,10 @@ protected:
 
 public:
 	virtual bool Activate(DeckLinkDevice *device, long long modeId);
-	virtual void Deactivate();
+	virtual bool Activate(DeckLinkDevice *device, long long modeId,
+			      BMDVideoConnection bmdVideoConnection,
+			      BMDAudioConnection bmdAudioConnection);
+	virtual void Deactivate() = 0;
 
 	DeckLinkDevice *GetDevice() const;
 };

+ 2 - 2
plugins/decklink/DecklinkInput.hpp

@@ -41,8 +41,8 @@ public:
 
 	bool Activate(DeckLinkDevice *device, long long modeId,
 		      BMDVideoConnection bmdVideoConnection,
-		      BMDAudioConnection bmdAudioConnection);
-	void Deactivate();
+		      BMDAudioConnection bmdAudioConnection) override;
+	void Deactivate() override;
 	bool Capturing();
 
 	bool buffering = false;