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

mac-decklink: Fix C++ virtual function warnings
This commit is contained in:
Jim
2020-08-11 18:09:31 -07:00
committed by GitHub
3 changed files with 11 additions and 4 deletions

View File

@@ -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;
}

View File

@@ -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;
};

View File

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