git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/frame/draw_frame.cpp b/core/frame/draw_frame.cpp
index 1737d72448779e8ac78c2dfc92b55185c360bea5..b95157c87aa0c5c47d730fa06a42f35ca7a53b19 100644 (file)
--- a/core/frame/draw_frame.cpp
+++ b/core/frame/draw_frame.cpp
@@ -90,7 +90,7 @@ spl::shared_ptr<draw_frame> draw_frame::interlace(const spl::shared_ptr<draw_fra
                return frame2;\r
 \r
        auto my_frame1 = spl::make_shared<draw_frame>(frame1);\r
-       auto my_frame2 = draw_frame::silence(spl::make_shared<draw_frame>(frame2));\r
+       auto my_frame2 = draw_frame::mute_audio(spl::make_shared<draw_frame>(frame2));\r
        if(mode == field_mode::upper)\r
        {\r
                my_frame1->get_frame_transform().field_mode = field_mode::upper;        \r
@@ -137,7 +137,7 @@ spl::shared_ptr<draw_frame> draw_frame::mask(const spl::shared_ptr<draw_frame>&
        return spl::make_shared<draw_frame>(std::move(frames));\r
 }\r
        \r
-spl::shared_ptr<draw_frame> draw_frame::silence(const spl::shared_ptr<draw_frame>& frame)\r
+spl::shared_ptr<draw_frame> draw_frame::mute_audio(const spl::shared_ptr<draw_frame>& frame)\r
 {\r
        auto frame2 = spl::make_shared<draw_frame>(frame);\r
        frame2->get_frame_transform().volume = 0.0;\r

diff --git a/core/frame/draw_frame.h b/core/frame/draw_frame.h
index a8e7963b0c0f52f4efe7323e941f029f9a7b3ae3..ae496499881f321fc4d8e94392f5b5f14585fc45 100644 (file)
--- a/core/frame/draw_frame.h
+++ b/core/frame/draw_frame.h
@@ -51,7 +51,7 @@ public:
        static spl::shared_ptr<draw_frame> interlace(const spl::shared_ptr<draw_frame>& frame1, const spl::shared_ptr<draw_frame>& frame2, field_mode mode);\r
        static spl::shared_ptr<draw_frame> over(const spl::shared_ptr<draw_frame>& frame1, const spl::shared_ptr<draw_frame>& frame2);\r
        static spl::shared_ptr<draw_frame> mask(const spl::shared_ptr<draw_frame>& fill, const spl::shared_ptr<draw_frame>& key);\r
-       static spl::shared_ptr<draw_frame> silence(const spl::shared_ptr<draw_frame>& frame);\r
+       static spl::shared_ptr<draw_frame> mute_audio(const spl::shared_ptr<draw_frame>& frame);\r
                \r
        static const spl::shared_ptr<draw_frame>& eof();\r
        static const spl::shared_ptr<draw_frame>& empty();\r

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index 1a7d0506a9395585750d297aa05a65acf3fcbced..d0c8a422d77baed7e2fef26980136e47bc8a2c8c 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -97,11 +97,11 @@ public:
                try\r
                {\r
                        if(is_paused_)\r
-                               return draw_frame::silence(foreground_->last_frame());\r
+                               return draw_frame::mute_audio(foreground_->last_frame());\r
                \r
                        auto frame = receive_and_follow(foreground_, flags.value());\r
                        if(frame == core::draw_frame::late())\r
-                               return draw_frame::silence(foreground_->last_frame());\r
+                               return draw_frame::mute_audio(foreground_->last_frame());\r
                        \r
                        ++frame_number_;\r
 \r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 3a0e30c529ba4fdeac744a6ae0f725b3ae0ffa8e..e62129316409cfc4c7bb34109274643e27f76e35 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -163,7 +163,7 @@ public:
 \r
        virtual spl::shared_ptr<core::draw_frame> last_frame() const override\r
        {\r
-               return core::draw_frame::silence(last_frame_);\r
+               return core::draw_frame::mute_audio(last_frame_);\r
        }\r
 \r
        virtual uint32_t nb_frames() const override\r