]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 21 Nov 2011 11:23:06 +0000 (11:23 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 21 Nov 2011 11:23:06 +0000 (11:23 +0000)
modules/bluefish/consumer/bluefish_consumer.cpp

index a3b933346b56362733ccebe8a76d3251f8ac97fd..49040a344fbf73546cb2d6e55b00c4590d8e7589 100644 (file)
@@ -62,9 +62,7 @@ struct bluefish_consumer : boost::noncopyable
 \r
        std::array<blue_dma_buffer_ptr, 4>      reserved_frames_;       \r
        tbb::concurrent_bounded_queue<std::shared_ptr<core::read_frame>> frame_buffer_;\r
-\r
-       int                                                                     preroll_count_;\r
-\r
+       \r
        const bool                                                      embedded_audio_;\r
        const bool                                                      key_only_;\r
        \r
@@ -76,7 +74,6 @@ public:
                , format_desc_(format_desc) \r
                , model_name_(get_card_desc(*blue_))\r
                , vid_fmt_(get_video_mode(*blue_, format_desc))\r
-               , preroll_count_(0)\r
                , embedded_audio_(embedded_audio)\r
                , key_only_(key_only)\r
                , executor_(print())\r
@@ -196,18 +193,7 @@ public:
        }\r
        \r
        void send(const safe_ptr<core::read_frame>& frame)\r
-       {       \r
-               if(preroll_count_ < executor_.capacity())\r
-               {\r
-                       while(preroll_count_++ < executor_.capacity())\r
-                               schedule_next_video(make_safe<core::read_frame>());\r
-               }\r
-               \r
-               schedule_next_video(frame);                     \r
-       }\r
-       \r
-       void schedule_next_video(const safe_ptr<core::read_frame>& frame)\r
-       {\r
+       {                       \r
                static std::vector<int16_t> silence(MAX_HANC_BUFFER_SIZE, 0);\r
                \r
                executor_.begin_invoke([=]\r