]> 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>
Wed, 11 May 2011 18:47:06 +0000 (18:47 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 11 May 2011 18:47:06 +0000 (18:47 +0000)
modules/decklink/consumer/decklink_consumer.cpp

index ffeaa07f093bc856c522886cd273aac8311c4501..7e4fc0782399c86b6c5d6a3b135b50fe86de8688 100644 (file)
@@ -179,8 +179,6 @@ public:
        ~decklink_consumer()\r
        {               \r
                is_running_ = false;\r
-               video_frame_buffer_.clear();\r
-               audio_frame_buffer_.clear();\r
                video_frame_buffer_.try_push(core::read_frame::empty());\r
                audio_frame_buffer_.try_push(core::read_frame::empty());\r
 \r
@@ -263,6 +261,13 @@ public:
        STDMETHOD_(ULONG, AddRef())                                     {return 1;}\r
        STDMETHOD_(ULONG, Release())                            {return 1;}\r
        \r
+       STDMETHOD(ScheduledPlaybackHasStopped())\r
+       {\r
+               is_running_ = false;\r
+               CASPAR_LOG(info) << print() << L" Scheduled playback has stopped.";\r
+               return S_OK;\r
+       }\r
+\r
        STDMETHOD(ScheduledFrameCompleted(IDeckLinkVideoFrame* completed_frame, BMDOutputFrameCompletionResult result))\r
        {\r
                if(!is_running_)\r
@@ -294,13 +299,6 @@ public:
 \r
                return S_OK;\r
        }\r
-\r
-       STDMETHOD(ScheduledPlaybackHasStopped())\r
-       {\r
-               is_running_ = false;\r
-               CASPAR_LOG(info) << print() << L" Scheduled playback has stopped.";\r
-               return S_OK;\r
-       }\r
                \r
        STDMETHOD(RenderAudioSamples(BOOL preroll))\r
        {\r