2.0. amcp: Simplified mixer commands.

[casparcg] / core / producer / transition / transition_producer.cpp

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index 66c79b9ee3bfbc03d054b3ad951c5d39e034686e..204eb084f21bde3eacf938df49665e1984b13bcd 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -33,7 +33,7 @@ namespace caspar { namespace core {
 \r
 struct transition_producer : public frame_producer\r
 {      \r
-       const video_mode::type          mode_;\r
+       const field_mode::type          mode_;\r
        unsigned int                            current_frame_;\r
        \r
        const transition_info           info_;\r
@@ -43,7 +43,7 @@ struct transition_producer : public frame_producer
 \r
        safe_ptr<basic_frame>           last_frame_;\r
                \r
-       explicit transition_producer(const video_mode::type& mode, const safe_ptr<frame_producer>& dest, const transition_info& info) \r
+       explicit transition_producer(const field_mode::type& mode, const safe_ptr<frame_producer>& dest, const transition_info& info) \r
                : mode_(mode)\r
                , current_frame_(0)\r
                , info_(info)\r
@@ -65,7 +65,7 @@ struct transition_producer : public frame_producer
 \r
        virtual safe_ptr<basic_frame> receive(int hints)\r
        {\r
-               if(current_frame_++ >= info_.duration)\r
+               if(++current_frame_ >= info_.duration)\r
                        return basic_frame::eof();\r
                \r
                auto dest = basic_frame::empty();\r
@@ -85,7 +85,7 @@ struct transition_producer : public frame_producer
                                source = source_producer_->last_frame();\r
                });\r
 \r
-               return last_frame_ = compose(dest, source);\r
+               return compose(dest, source);\r
        }\r
 \r
        virtual safe_ptr<core::basic_frame> last_frame() const\r
@@ -121,23 +121,23 @@ struct transition_producer : public frame_producer
                auto s_frame2 = make_safe<basic_frame>(src_frame);\r
 \r
                s_frame1->get_audio_transform().set_has_audio(false);\r
-               s_frame2->get_audio_transform().set_gain(1.0-delta2);\r
+               s_frame2->get_audio_transform().set_volume(1.0-delta2);\r
 \r
                auto d_frame1 = make_safe<basic_frame>(dest_frame);\r
                auto d_frame2 = make_safe<basic_frame>(dest_frame);\r
                \r
                d_frame1->get_audio_transform().set_has_audio(false);\r
-               d_frame2->get_audio_transform().set_gain(delta2);\r
+               d_frame2->get_audio_transform().set_volume(delta2);\r
 \r
-               if(info_.type == transition::mix)\r
-               {\r
-                       d_frame1->get_image_transform().set_opacity(delta1);    \r
-                       d_frame2->get_image_transform().set_opacity(delta2);\r
+               //if(info_.type == transition::mix)\r
+               //{\r
+               //      d_frame1->get_image_transform().set_opacity(delta1);    \r
+               //      d_frame2->get_image_transform().set_opacity(delta2);\r
 \r
-                       //s_frame1->get_image_transform().set_opacity(1.0-delta1);      \r
-                       //s_frame2->get_image_transform().set_opacity(1.0-delta2);              \r
-               }\r
-               else if(info_.type == transition::slide)\r
+               //      s_frame1->get_image_transform().set_opacity(1.0-delta1);        \r
+               //      s_frame2->get_image_transform().set_opacity(1.0-delta2);                \r
+               //}\r
+               if(info_.type == transition::slide)\r
                {\r
                        d_frame1->get_image_transform().set_fill_translation((-1.0+delta1)*dir, 0.0);   \r
                        d_frame2->get_image_transform().set_fill_translation((-1.0+delta2)*dir, 0.0);           \r
@@ -159,11 +159,13 @@ struct transition_producer : public frame_producer
                const auto s_frame = s_frame1->get_image_transform() == s_frame2->get_image_transform() ? s_frame2 : basic_frame::interlace(s_frame1, s_frame2, mode_);\r
                const auto d_frame = d_frame1->get_image_transform() == d_frame2->get_image_transform() ? d_frame2 : basic_frame::interlace(d_frame1, d_frame2, mode_);\r
                \r
+               last_frame_ = basic_frame::combine(s_frame2, d_frame2);\r
+\r
                return basic_frame::combine(s_frame, d_frame);\r
        }\r
 };\r
 \r
-safe_ptr<frame_producer> create_transition_producer(const video_mode::type& mode, const safe_ptr<frame_producer>& destination, const transition_info& info)\r
+safe_ptr<frame_producer> create_transition_producer(const field_mode::type& mode, const safe_ptr<frame_producer>& destination, const transition_info& info)\r
 {\r
        return make_safe<transition_producer>(mode, destination, info);\r
 }\r