From 01eec3efb6e581ccf42c66d09b60333ca7604f3e Mon Sep 17 00:00:00 2001
From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Fri, 25 Nov 2011 15:58:56 +0000
Subject: [PATCH] 2.0.2: playlist_producer: Added as a simple example/template
 how to make a playlist producer. I leave it open to anyone else to develop
 it.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.2@1655 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
---
 core/core.vcxproj                    |  7 +++++++
 core/core.vcxproj.filters            |  9 +++++++++
 core/producer/frame_producer.cpp     | 14 ++++++++++++++
 core/producer/frame_producer.h       |  1 +
 protocol/cii/CIIProtocolStrategy.cpp |  2 +-
 shell/casparcg.config                |  6 +++---
 6 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/core/core.vcxproj b/core/core.vcxproj
index c79e4a08e..9c971c921 100644
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -253,6 +253,7 @@
     <ClInclude Include="mixer\image\blending_glsl.h" />
     <ClInclude Include="mixer\image\blend_modes.h" />
     <ClInclude Include="mixer\image\image_shader.h" />
+    <ClInclude Include="producer\playlist\playlist_producer.h" />
     <ClInclude Include="video_channel.h" />
     <ClInclude Include="consumer\output.h" />
     <ClInclude Include="consumer\frame_consumer.h" />
@@ -309,6 +310,12 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../../StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
+    <ClCompile Include="producer\playlist\playlist_producer.cpp">
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../../stdafx.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../stdafx.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../../stdafx.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../stdafx.h</PrecompiledHeaderFile>
+    </ClCompile>
     <ClCompile Include="video_channel.cpp" />
     <ClCompile Include="consumer\frame_consumer.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../StdAfx.h</PrecompiledHeaderFile>
diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index b9995b672..9e786645c 100644
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -34,6 +34,9 @@
     <Filter Include="source\consumer">
       <UniqueIdentifier>{35d7835f-f813-4b4b-8d8d-8a35dfef68d3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="source\producer\playlist">
+      <UniqueIdentifier>{80ce21ca-5ecd-48c1-97d2-c20ea8e2f2b6}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="producer\transition\transition_producer.h">
@@ -127,6 +130,9 @@
     <ClInclude Include="mixer\audio\audio_util.h">
       <Filter>source\mixer\audio</Filter>
     </ClInclude>
+    <ClInclude Include="producer\playlist\playlist_producer.h">
+      <Filter>source\producer\playlist</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="producer\transition\transition_producer.cpp">
@@ -205,5 +211,8 @@
     <ClCompile Include="producer\frame\frame_transform.cpp">
       <Filter>source\producer\frame</Filter>
     </ClCompile>
+    <ClCompile Include="producer\playlist\playlist_producer.cpp">
+      <Filter>source\producer\playlist</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 454c8ee22..7b0c23276 100644
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -25,6 +25,7 @@
 #include "frame/frame_transform.h"
 
 #include "color/color_producer.h"
+#include "playlist/playlist_producer.h"
 #include "separated/separated_producer.h"
 
 #include <common/memory/safe_ptr.h>
@@ -185,6 +186,9 @@ safe_ptr<core::frame_producer> do_create_producer(const safe_ptr<frame_factory>&
 	if(producer == frame_producer::empty())
 		producer = create_color_producer(my_frame_factory, params);
 	
+	if(producer == frame_producer::empty())
+		producer = create_playlist_producer(my_frame_factory, params);
+
 	return producer;
 }
 
@@ -224,4 +228,14 @@ safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& my
 	return producer;
 }
 
+
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& factory, const std::wstring& params)
+{
+	std::wstringstream iss(params);
+	std::vector<std::wstring> tokens;
+	typedef std::istream_iterator<std::wstring, wchar_t, std::char_traits<wchar_t> > iterator;
+	std::copy(iterator(iss),  iterator(), std::back_inserter(tokens));
+	return create_producer(factory, tokens);
+}
+
 }}
\ No newline at end of file
diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index 21c2ab26e..c271501d6 100644
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -70,6 +70,7 @@ safe_ptr<basic_frame> receive_and_follow(safe_ptr<frame_producer>& producer, int
 typedef std::function<safe_ptr<core::frame_producer>(const safe_ptr<frame_factory>&, const std::vector<std::wstring>&)> producer_factory_t;
 void register_producer_factory(const producer_factory_t& factory); // Not thread-safe.
 safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>&, const std::vector<std::wstring>& params);
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>&, const std::wstring& params);
 safe_ptr<core::frame_producer> create_destroy_proxy(safe_ptr<core::frame_producer>&& producer);
 
 template<typename T>
diff --git a/protocol/cii/CIIProtocolStrategy.cpp b/protocol/cii/CIIProtocolStrategy.cpp
index f07685553..1a381ca82 100644
--- a/protocol/cii/CIIProtocolStrategy.cpp
+++ b/protocol/cii/CIIProtocolStrategy.cpp
@@ -213,7 +213,7 @@ void CIIProtocolStrategy::DisplayMediaFile(const std::wstring& filename)
 	transition.type = transition::mix;
 	transition.duration = 12;
 
-	auto pFP = create_producer(GetChannel()->mixer(), boost::assign::list_of(filename));
+	auto pFP = create_producer(GetChannel()->mixer(), filename);
 	auto pTransition = create_transition_producer(GetChannel()->get_video_format_desc().field_mode, pFP, transition);
 
 	try
diff --git a/shell/casparcg.config b/shell/casparcg.config
index a06fb8ab2..0884567ab 100644
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <paths>
-    <media-path>L:\casparcg\_media\</media-path>
+    <media-path>C:\casparmedia\_media\</media-path>
     <log-path>L:\casparcg\_log\</log-path>
     <data-path>L:\casparcg\_data\</data-path>
-    <template-path>L:\casparcg\_templates\</template-path>
+    <template-path>C:\casparmedia\_templates\</template-path>
   </paths>
   <blend-modes>true</blend-modes>
   <auto-transcode>true</auto-transcode>
@@ -13,7 +13,7 @@
     <channel>
       <video-mode>PAL</video-mode>
       <consumers>
-        <decklink></decklink>
+        <screen></screen>
       </consumers>
     </channel>
   </channels>
-- 
2.39.2