]> 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>
Thu, 3 Mar 2011 20:21:12 +0000 (20:21 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Thu, 3 Mar 2011 20:21:12 +0000 (20:21 +0000)
mixer/frame_mixer_device.cpp

index 8b1cfedab33d074235236164b4826fdb25c6ffd7..ed771010bdecc70c5b1b57ee14e22a15d8ca4a75 100644 (file)
@@ -135,10 +135,10 @@ public:
                        BOOST_FOREACH(auto& frame, frames)\r
                        {\r
                                int num = format_desc_.mode == video_mode::progressive ? 1 : 2;\r
-                               auto transform = root_audio_transform_.fetch_and_tick(num)*audio_transforms_[frame->get_layer_index()].fetch_and_tick(num);\r
-                               audio_mixer_.begin(transform);\r
-                               frame->process_audio(audio_mixer_);\r
-                               audio_mixer_.end();\r
+\r
+                               auto frame1 = make_safe<draw_frame>(frame);\r
+                               frame1->get_audio_transform() = root_audio_transform_.fetch_and_tick(num)*audio_transforms_[frame->get_layer_index()].fetch_and_tick(num);\r
+                               frame1->process_audio(audio_mixer_);\r
                        }\r
                        audio_mixer_.end_pass();\r
 \r