]> 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>
Tue, 29 Nov 2011 17:51:27 +0000 (17:51 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 29 Nov 2011 17:51:27 +0000 (17:51 +0000)
modules/bluefish/consumer/bluefish_consumer.cpp

index 36043247036e4065c692aa95318bf865a59f83a6..2758a99f85971f0c2447c6224759325aba91cb46 100644 (file)
@@ -184,6 +184,7 @@ public:
 \r
        void disable_video_output()\r
        {\r
+               blue_->video_playback_stop(0,0);\r
                if(!BLUE_PASS(set_card_property(blue_, VIDEO_BLACKGENERATOR, 1)))\r
                        CASPAR_LOG(error)<< print() << TEXT(" Failed to disable video output.");                \r
        }\r
@@ -235,7 +236,7 @@ public:
 \r
                if(embedded_audio_)\r
                {               \r
-                       auto frame_audio = core::audio_32_to_16_sse(frame->audio_data());                       \r
+                       auto frame_audio = core::audio_32_to_16(frame->audio_data());                   \r
                        encode_hanc(reinterpret_cast<BLUE_UINT32*>(reserved_frames_.front()->hanc_data()), frame_audio.data(), frame->audio_data().size()/2, format_desc_.audio_channels);\r
                                                                \r
                        blue_->system_buffer_write_async(const_cast<uint8_t*>(reserved_frames_.front()->image_data()), \r