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

diff --git a/core/core.vcxproj b/core/core.vcxproj
index e518e2212a6a5a0cd44a44891985cb030bde2ef0..55dacbf4538f03ba6df74e2064cd43c17948c2a4 100644 (file)
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -409,6 +409,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">Create</PrecompiledHeader>\r
     </ClCompile>\r
+    <ClCompile Include="video_channel_context.cpp" />\r
     <ClCompile Include="video_format.cpp">\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">StdAfx.h</PrecompiledHeaderFile>\r

diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index 93398a6ed16005e2673b08b87963443c166f191e..4b6e63b7509817db19b9e67992947201ecf26271 100644 (file)
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -171,5 +171,6 @@
     </ClCompile>\r
     <ClCompile Include="video_channel.cpp" />\r
     <ClCompile Include="StdAfx.cpp" />\r
+    <ClCompile Include="video_channel_context.cpp" />\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/core/video_channel_context.cpp b/core/video_channel_context.cpp
new file mode 100644 (file)
index 0000000..800e307
--- /dev/null
+++ b/core/video_channel_context.cpp
@@ -0,0 +1,41 @@
+#include "stdAfx.h"\r
+\r
+#include "video_channel_context.h"\r
+\r
+namespace caspar { namespace core {\r
+\r
+video_channel_context::video_channel_context(int index, ogl_device& ogl, const video_format_desc& format_desc) \r
+       : index_(index)\r
+       , format_desc_(format_desc)\r
+       , execution_(print() + L"/execution")\r
+       , destruction_(print() + L"/destruction")\r
+       , ogl_(ogl)\r
+{\r
+       execution_.set_priority_class(above_normal_priority_class);\r
+       destruction_.set_priority_class(below_normal_priority_class);\r
+}\r
+\r
+const int video_channel_context::index() const {return index_;}\r
+\r
+video_format_desc video_channel_context::get_format_desc()\r
+{\r
+       tbb::spin_rw_mutex::scoped_lock lock(mutex_, false);\r
+       return format_desc_;\r
+}\r
+\r
+void video_channel_context::set_format_desc(const video_format_desc& format_desc)\r
+{\r
+       tbb::spin_rw_mutex::scoped_lock lock(mutex_, true);\r
+       format_desc_ = format_desc;\r
+}\r
+\r
+executor& video_channel_context::execution() {return execution_;}\r
+executor& video_channel_context::destruction() {return destruction_;}\r
+ogl_device& video_channel_context::ogl() { return ogl_;}\r
+\r
+std::wstring video_channel_context::print() const\r
+{\r
+       return L"video_channel[" + boost::lexical_cast<std::wstring>(index_+1) + L"-" +  format_desc_.name + L"]";\r
+}\r
+\r
+}}
\ No newline at end of file

diff --git a/core/video_channel_context.h b/core/video_channel_context.h
index 7943582fe4925bdb022cea717477c9477f8de660..f30799147c047ad7595dd07c0c51f54cb28fa376 100644 (file)
--- a/core/video_channel_context.h
+++ b/core/video_channel_context.h
@@ -24,39 +24,15 @@ class video_channel_context
        ogl_device&                                     ogl_;\r
 \r
 public:\r
-       video_channel_context(int index, ogl_device& ogl, const video_format_desc& format_desc) \r
-               : index_(index)\r
-               , format_desc_(format_desc)\r
-               , execution_(print() + L"/execution")\r
-               , destruction_(print() + L"/destruction")\r
-               , ogl_(ogl)\r
-       {\r
-               execution_.set_priority_class(above_normal_priority_class);\r
-               destruction_.set_priority_class(below_normal_priority_class);\r
-       }\r
-\r
-       const int index() const {return index_;}\r
-\r
-       video_format_desc get_format_desc()\r
-       {\r
-               tbb::spin_rw_mutex::scoped_lock lock(mutex_, false);\r
-               return format_desc_;\r
-       }\r
-\r
-       void set_format_desc(const video_format_desc& format_desc)\r
-       {\r
-               tbb::spin_rw_mutex::scoped_lock lock(mutex_, true);\r
-               format_desc_ = format_desc;\r
-       }\r
-\r
-       executor& execution() {return execution_;}\r
-       executor& destruction() {return destruction_;}\r
-       ogl_device& ogl() { return ogl_;}\r
-\r
-       std::wstring print() const\r
-       {\r
-               return L"video_channel[" + boost::lexical_cast<std::wstring>(index_+1) + L"-" +  format_desc_.name + L"]";\r
-       }\r
+       video_channel_context(int index, ogl_device& ogl, const video_format_desc& format_desc);\r
+\r
+       const int                       index() const;\r
+       video_format_desc       get_format_desc();\r
+       void                            set_format_desc(const video_format_desc& format_desc);\r
+       executor&                       execution();\r
+       executor&                       destruction();\r
+       ogl_device&                     ogl();\r
+       std::wstring            print() const;\r
 };\r
        \r
 }}
\ No newline at end of file