Make for clean shutdown of the output cards.

[nageru] / decklink_output.cpp

diff --git a/decklink_output.cpp b/decklink_output.cpp
index 7fa689e547610c0fb14696349a87f3e445e42422..c5bf96b3a0c404f0f448535d5da3fd3a286641c1 100644 (file)
--- a/decklink_output.cpp
+++ b/decklink_output.cpp
@@ -63,8 +63,10 @@ void DeckLinkOutput::set_device(IDeckLink *decklink)
 void DeckLinkOutput::start_output(uint32_t mode, int64_t base_pts)
 {
        assert(output);
+       assert(!playback_initiated);
 
        should_quit = false;
+       playback_initiated = true;
        playback_started = false;
        this->base_pts = base_pts;
 
@@ -153,9 +155,14 @@ void DeckLinkOutput::start_output(uint32_t mode, int64_t base_pts)
 
 void DeckLinkOutput::end_output()
 {
+       if (!playback_initiated) {
+               return;
+       }
+
        should_quit = true;
        frame_queues_changed.notify_all();
        present_thread.join();
+       playback_initiated = false;
 
        output->StopScheduledPlayback(0, nullptr, 0);
        output->DisableVideoOutput();