2.0.2: - core: some cleanup.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.2@1770 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/core.vcxproj b/core/core.vcxproj
index 1756bd4f897713dec937af79da6d87c6a4846943..cc1ca9ca7ed0649f09d0d7c591203fe403988016 100644 (file)
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -250,9 +250,9 @@
     <ClInclude Include="mixer\audio\audio_util.h" />\r
     <ClInclude Include="mixer\gpu\fence.h" />\r
     <ClInclude Include="mixer\gpu\shader.h" />\r
-    <ClInclude Include="mixer\image\blending_glsl.h" />\r
     <ClInclude Include="mixer\image\blend_modes.h" />\r
-    <ClInclude Include="mixer\image\image_shader.h" />\r
+    <ClInclude Include="mixer\image\shader\blending_glsl.h" />\r
+    <ClInclude Include="mixer\image\shader\image_shader.h" />\r
     <ClInclude Include="producer\playlist\playlist_producer.h" />\r
     <ClInclude Include="video_channel.h" />\r
     <ClInclude Include="consumer\output.h" />\r
@@ -304,11 +304,8 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
     </ClCompile>\r
-    <ClCompile Include="mixer\image\image_shader.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
+    <ClCompile Include="mixer\image\shader\image_shader.cpp">\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../StdAfx.h</PrecompiledHeaderFile>\r
     </ClCompile>\r
     <ClCompile Include="producer\playlist\playlist_producer.cpp">\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../../stdafx.h</PrecompiledHeaderFile>\r

diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index c9c93e2161817135781719cefecd36f4ed845fab..ed801f84f64b2fec2e78b86a95498231858832b5 100644 (file)
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -37,6 +37,9 @@
     <Filter Include="source\producer\playlist">\r
       <UniqueIdentifier>{80ce21ca-5ecd-48c1-97d2-c20ea8e2f2b6}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="source\mixer\image\shader">\r
+      <UniqueIdentifier>{e0a140f8-e217-465c-a934-163b7ea786be}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="producer\transition\transition_producer.h">\r
@@ -109,21 +112,12 @@
     <ClInclude Include="video_channel.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="mixer\image\blending_glsl.h">\r
-      <Filter>source\mixer\image</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="mixer\gpu\shader.h">\r
       <Filter>source\mixer\gpu</Filter>\r
     </ClInclude>\r
     <ClInclude Include="mixer\gpu\fence.h">\r
       <Filter>source\mixer\gpu</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="mixer\image\image_shader.h">\r
-      <Filter>source\mixer\image</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="mixer\image\blend_modes.h">\r
-      <Filter>source\mixer\image</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="producer\frame\frame_transform.h">\r
       <Filter>source\producer\frame</Filter>\r
     </ClInclude>\r
@@ -133,6 +127,15 @@
     <ClInclude Include="producer\playlist\playlist_producer.h">\r
       <Filter>source\producer\playlist</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="mixer\image\shader\image_shader.h">\r
+      <Filter>source\mixer\image\shader</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="mixer\image\blend_modes.h">\r
+      <Filter>source\mixer\image</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="mixer\image\shader\blending_glsl.h">\r
+      <Filter>source\mixer\image\shader</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="producer\transition\transition_producer.cpp">\r
@@ -199,12 +202,6 @@
     <ClCompile Include="mixer\gpu\fence.cpp">\r
       <Filter>source\mixer\gpu</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="mixer\image\image_shader.cpp">\r
-      <Filter>source\mixer\image</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="mixer\image\blend_modes.cpp">\r
-      <Filter>source\mixer\image</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="producer\frame\frame_transform.cpp">\r
       <Filter>source\producer\frame</Filter>\r
     </ClCompile>\r
@@ -214,5 +211,11 @@
     <ClCompile Include="producer\frame_producer.cpp">\r
       <Filter>source\producer</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="mixer\image\shader\image_shader.cpp">\r
+      <Filter>source\mixer\image\shader</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="mixer\image\blend_modes.cpp">\r
+      <Filter>source\mixer\image</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index 1f08d70408f7ff5d78c8f33db606f382f55341df..86303f09939e2791acb56bb2a02ffa7d4adc5a8b 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -184,11 +184,6 @@ audio_mixer::audio_mixer() : impl_(new implementation()){}
 void audio_mixer::begin(core::basic_frame& frame){impl_->begin(frame);}\r
 void audio_mixer::visit(core::write_frame& frame){impl_->visit(frame);}\r
 void audio_mixer::end(){impl_->end();}\r
-audio_buffer audio_mixer::mix(const video_format_desc& format_desc){return impl_->mix(format_desc);}\r
-audio_mixer& audio_mixer::operator=(audio_mixer&& other)\r
-{\r
-       impl_ = std::move(other.impl_);\r
-       return *this;\r
-}\r
+audio_buffer audio_mixer::operator()(const video_format_desc& format_desc){return impl_->mix(format_desc);}\r
 \r
 }}
\ No newline at end of file

diff --git a/core/mixer/audio/audio_mixer.h b/core/mixer/audio/audio_mixer.h
index fc24147f02c61d711ba574073d3f25d2b8ddb07d..e65d5d31175be3d94b08ae17040dcbeb288b195d 100644 (file)
--- a/core/mixer/audio/audio_mixer.h
+++ b/core/mixer/audio/audio_mixer.h
@@ -46,9 +46,8 @@ public:
        virtual void visit(core::write_frame& frame);\r
        virtual void end();\r
 \r
-       audio_buffer mix(const video_format_desc& format_desc);\r
+       audio_buffer operator()(const video_format_desc& format_desc);\r
        \r
-       audio_mixer& operator=(audio_mixer&& other);\r
 private:\r
        struct implementation;\r
        safe_ptr<implementation> impl_;\r

diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp
index 2493f41c2ee5676ca2dbf8b6dae9192ecc1faa12..f7e837b8b3510c83e79003191d636766b8004ba9 100644 (file)
--- a/core/mixer/image/image_kernel.cpp
+++ b/core/mixer/image/image_kernel.cpp
@@ -23,9 +23,9 @@
 \r
 #include "image_kernel.h"\r
 \r
-#include "image_shader.h"\r
+#include "shader/image_shader.h"\r
+#include "shader/blending_glsl.h"\r
 \r
-#include "blending_glsl.h"\r
 #include "../gpu/shader.h"\r
 #include "../gpu/device_buffer.h"\r
 #include "../gpu/ogl_device.h"\r

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index 2a17567bfed00bd10f3891100357efe525c8a38c..7cb74b285c437e9039cbfefb9d441cd9bab7df7e 100644 (file)
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -283,25 +283,14 @@ public:
        {\r
                return renderer_(std::move(layers_), format_desc);\r
        }\r
-\r
-       safe_ptr<write_frame> create_frame(const void* tag, const pixel_format_desc& desc)\r
-       {\r
-               return make_safe<write_frame>(ogl_, tag, desc);\r
-       }\r
 };\r
 \r
 image_mixer::image_mixer(const safe_ptr<ogl_device>& ogl) : impl_(new implementation(ogl)){}\r
 void image_mixer::begin(basic_frame& frame){impl_->begin(frame);}\r
 void image_mixer::visit(write_frame& frame){impl_->visit(frame);}\r
 void image_mixer::end(){impl_->end();}\r
-boost::unique_future<safe_ptr<host_buffer>> image_mixer::render(const video_format_desc& format_desc){return impl_->render(format_desc);}\r
-safe_ptr<write_frame> image_mixer::create_frame(const void* tag, const pixel_format_desc& desc){return impl_->create_frame(tag, desc);}\r
+boost::unique_future<safe_ptr<host_buffer>> image_mixer::operator()(const video_format_desc& format_desc){return impl_->render(format_desc);}\r
 void image_mixer::begin_layer(blend_mode::type blend_mode){impl_->begin_layer(blend_mode);}\r
 void image_mixer::end_layer(){impl_->end_layer();}\r
-image_mixer& image_mixer::operator=(image_mixer&& other)\r
-{\r
-       impl_ = std::move(other.impl_);\r
-       return *this;\r
-}\r
 \r
 }}
\ No newline at end of file

diff --git a/core/mixer/image/image_mixer.h b/core/mixer/image/image_mixer.h
index 1ef73f42816266097d1c93c31d0a32b666251656..664d7c2377639faac2f84d056acf81173964a5e3 100644 (file)
--- a/core/mixer/image/image_mixer.h
+++ b/core/mixer/image/image_mixer.h
@@ -50,14 +50,9 @@ public:
 \r
        void begin_layer(blend_mode::type blend_mode);\r
        void end_layer();\r
-\r
-       image_mixer& operator=(image_mixer&& other);\r
-       \r
-       boost::unique_future<safe_ptr<host_buffer>> render(const video_format_desc& format_desc);\r
-\r
-       safe_ptr<write_frame> create_frame(const void* tag, const pixel_format_desc& format);\r
-       \r
-       void set_video_format_desc(const video_format_desc& format_desc);\r
+               \r
+       boost::unique_future<safe_ptr<host_buffer>> operator()(const video_format_desc& format_desc);\r
+               \r
 private:\r
        struct implementation;\r
        safe_ptr<implementation> impl_;\r

diff --git a/core/mixer/image/blending_glsl.h b/core/mixer/image/shader/blending_glsl.h
similarity index 100%
rename from core/mixer/image/blending_glsl.h
rename to core/mixer/image/shader/blending_glsl.h

diff --git a/core/mixer/image/image_shader.cpp b/core/mixer/image/shader/image_shader.cpp
similarity index 96%
rename from core/mixer/image/image_shader.cpp
rename to core/mixer/image/shader/image_shader.cpp
index b368c2666521afdee951b1faa1f464446444f2c5..0128335dedba55abbda08407b3e42f65f29f34de 100644 (file)
--- a/core/mixer/image/image_shader.cpp
+++ b/core/mixer/image/shader/image_shader.cpp
@@ -19,12 +19,12 @@
 * Author: Robert Nagy, ronag89@gmail.com\r
 */\r
 \r
-#include "../../StdAfx.h"\r
+#include "../../../StdAfx.h"\r
 \r
 #include "image_shader.h"\r
 \r
-#include "../gpu/shader.h"\r
-#include "../gpu/ogl_device.h"\r
+#include "../../gpu/shader.h"\r
+#include "../../gpu/ogl_device.h"\r
 \r
 #include "blending_glsl.h"\r
 \r

diff --git a/core/mixer/image/image_shader.h b/core/mixer/image/shader/image_shader.h
similarity index 100%
rename from core/mixer/image/image_shader.h
rename to core/mixer/image/shader/image_shader.h

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index ff10802af4a0cdd4b93b5a17a424f979dc0fb553..60666264e7d2ef5e92bf3a0bbc1d818a244ba777 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -148,8 +148,8 @@ public:
                                        image_mixer_.end_layer();\r
                                }\r
 \r
-                               auto image = image_mixer_.render(format_desc_);\r
-                               auto audio = audio_mixer_.mix(format_desc_);\r
+                               auto image = image_mixer_(format_desc_);\r
+                               auto audio = audio_mixer_(format_desc_);\r
                                image.wait();\r
 \r
                                graph_->update_value("mix-time", mix_timer_.elapsed()*format_desc_.fps*0.5);\r
@@ -165,7 +165,7 @@ public:
                                        \r
        safe_ptr<core::write_frame> create_frame(const void* tag, const core::pixel_format_desc& desc)\r
        {               \r
-               return image_mixer_.create_frame(tag, desc);\r
+               return make_safe<write_frame>(ogl_, tag, desc);\r
        }\r
                        \r
        void set_transform(int index, const frame_transform& transform, unsigned int mix_duration, const std::wstring& tween)\r