]> git.sesse.net Git - casparcg/commitdiff
2.0.0.2: Fixed preview bug.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 26 Jan 2011 18:24:24 +0000 (18:24 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 26 Jan 2011 18:24:24 +0000 (18:24 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@426 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

core/producer/layer.cpp

index 698aa4931a0eda999920374a9017f3b7a5fb97bc..4807a6872df8e9bfcdcb0897b6ee1f1c249e7d1d 100644 (file)
@@ -2,9 +2,10 @@
 \r
 #include "layer.h"\r
 \r
-#include "../mixer/frame/draw_frame.h"\r
-#include "../mixer/image/image_mixer.h"\r
-#include "../mixer/audio/audio_mixer.h"\r
+#include <mixer/frame/draw_frame.h>\r
+#include <mixer/image/image_mixer.h>\r
+#include <mixer/audio/audio_mixer.h>\r
+#include <mixer/audio/audio_transform.h>\r
 #include "../producer/frame_producer.h"\r
 \r
 #include "../video_format.h"\r
@@ -37,7 +38,8 @@ public:
        void preview(const safe_ptr<frame_producer>& frame_producer)\r
        {\r
                stop();\r
-               load(frame_producer, false);            \r
+               foreground_ = frame_producer;\r
+               background_ = frame_producer::empty();\r
                try\r
                {\r
                        last_frame_ = frame_producer->receive();\r
@@ -82,7 +84,10 @@ public:
        safe_ptr<draw_frame> receive()\r
        {               \r
                if(is_paused_)\r
+               {\r
+                       last_frame_->get_audio_transform().set_gain(0.0);\r
                        return last_frame_;\r
+               }\r
 \r
                try\r
                {\r