Browse Source

Merge pull request #3253 from JohannMG/mac-decklink-warnings

mac-decklink: Fix C++ virtual function warnings
Jim 5 years ago
parent
commit
c5b3125b75

+ 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;