2.1.0: Reset consumers before re-initializing.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2263 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index 85ac6d12f6b0dbb806d482099fb9f4b67221bad3..88f5cb4eb90bc6a3b8602d0c48905638e94ef36b 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -313,6 +313,7 @@ public:
        \r
        virtual void initialize(const core::video_format_desc& format_desc, int channel_index) override\r
        {\r
+               consumer_.reset();\r
                consumer_.reset(new bluefish_consumer(format_desc, device_index_, embedded_audio_, key_only_, channel_index));\r
                audio_cadence_ = format_desc.audio_cadence;     \r
        }\r

diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index a8296a832d0b5aea1cc25df33c6addbfca138adb..67938ef751f59f2d8f97265ee05ada74f869a16f 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -512,6 +512,7 @@ public:
        {\r
                executor_.invoke([=]\r
                {\r
+                       consumer_.reset();\r
                        consumer_.reset(new decklink_consumer(config_, format_desc, channel_index));            \r
                        audio_cadence_ = format_desc.audio_cadence;                     \r
                });\r