2.1.0: -bluefish_consumer+decklink_consumer: Removed reduntant audio cadence check.

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

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index 6558beab689bf44a26b72a0ad7662e80941ebd8d..63b689a114ac339232da8d4d2721dc80f3a22b0c 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -299,7 +299,6 @@ struct bluefish_consumer_proxy : public core::frame_consumer
        const int                                                       device_index_;\r
        const bool                                                      embedded_audio_;\r
        const bool                                                      key_only_;\r
-       std::vector<int>                                        audio_cadence_;\r
 public:\r
 \r
        bluefish_consumer_proxy(int device_index, bool embedded_audio, bool key_only)\r
@@ -315,14 +314,10 @@ public:
        {\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
        \r
        virtual bool send(const spl::shared_ptr<const core::data_frame>& frame) override\r
        {\r
-               CASPAR_VERIFY(audio_cadence_.front() == static_cast<size_t>(frame->audio_data().size()));\r
-               boost::range::rotate(audio_cadence_, std::begin(audio_cadence_)+1);\r
-\r
                consumer_->send(frame);\r
                return true;\r
        }\r

diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index 84788028ee74ea531f7e189c2b7997a1d15042a2..b4665113ad9480cfaac5fa0411d2886ca05b72f8 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -484,7 +484,6 @@ struct decklink_consumer_proxy : public core::frame_consumer
 {\r
        const configuration                                     config_;\r
        std::unique_ptr<decklink_consumer>      consumer_;\r
-       std::vector<int>                                        audio_cadence_;\r
        executor                                                        executor_;\r
 public:\r
 \r
@@ -513,16 +512,12 @@ public:
                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
+                       consumer_.reset(new decklink_consumer(config_, format_desc, channel_index));                    \r
                });\r
        }\r
        \r
        virtual bool send(const spl::shared_ptr<const core::data_frame>& frame) override\r
        {\r
-               CASPAR_VERIFY(audio_cadence_.front() == static_cast<int>(frame->audio_data().size()));\r
-               boost::range::rotate(audio_cadence_, std::begin(audio_cadence_)+1);\r
-\r
                consumer_->send(frame);\r
                return true;\r
        }\r