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

diff --git a/core/consumer/frame_consumer_device.cpp b/core/consumer/frame_consumer_device.cpp
index 7045ebf8759e9d71e66a55a881c3007f9c37a880..b341898cdef3afce986703f8b6da14754b337019 100644 (file)
--- a/core/consumer/frame_consumer_device.cpp
+++ b/core/consumer/frame_consumer_device.cpp
@@ -36,16 +36,6 @@ public:
                executor_.start();\r
        }\r
 \r
-       ~implementation()\r
-       {\r
-               executor_.clear();\r
-               CASPAR_LOG(info) << "Removing consumers from consumer-device.";\r
-               executor_.invoke([this]{consumers_.clear();});\r
-               CASPAR_LOG(info) << "Stopping consumer-device.";\r
-               executor_.stop();\r
-               CASPAR_LOG(info) << "Releasing consumer-device.";\r
-       }\r
-\r
        void add(int index, safe_ptr<frame_consumer>&& consumer)\r
        {               \r
                consumer->initialize(format_desc_);\r
@@ -64,7 +54,7 @@ public:
                        auto it = consumers_.find(index);\r
                        if(it != consumers_.end())\r
                        {\r
-                               CASPAR_LOG(info) << it->second->print() << L" Removed.";\r
+                               CASPAR_LOG(info) << print() << L" " << it->second->print() << L" Removed.";\r
                                consumers_.erase(it);\r
                        }\r
                });\r
@@ -91,7 +81,7 @@ public:
                                {\r
                                        CASPAR_LOG_CURRENT_EXCEPTION();\r
                                        consumers_.erase(it++);\r
-                                       CASPAR_LOG(warning) << "Removed consumer from frame_consumer_device.";\r
+                                       CASPAR_LOG(error) << print() << L" " << it->second->print() << L" Removed.";\r
                                }\r
                        }\r
                });\r

diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index 94010115aee5bc7e3a7ecbc966cb016f31ec8c6d..95696ccc74267ed04f5a1ef1bc3718795a59e4ed 100644 (file)
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -50,12 +50,6 @@
     <ClInclude Include="producer\frame\basic_frame.h">\r
       <Filter>producer\frame</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="producer\frame\frame_factory.h">\r
-      <Filter>producer\frame</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="producer\frame\frame_visitor.h">\r
-      <Filter>producer\frame</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="producer\frame\image_transform.h">\r
       <Filter>producer\frame</Filter>\r
     </ClInclude>\r
@@ -69,6 +63,12 @@
       <Filter>consumer\frame</Filter>\r
     </ClInclude>\r
     <ClInclude Include="video_format.h" />\r
+    <ClInclude Include="producer\frame\frame_visitor.h">\r
+      <Filter>producer\frame</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="producer\frame\frame_factory.h">\r
+      <Filter>producer\frame</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="producer\transition\transition_producer.cpp">\r

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index e5a0ccb968781c3f1f37a8eaf6c08324761abfa9..3a7184699632e702ddb8cf4d72952c764f4d95ce 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -132,7 +132,7 @@ struct transition_producer : public frame_producer
 \r
        std::wstring print() const\r
        {\r
-               return L"transition[" + transition::print(info_.type) + L":" + boost::lexical_cast<std::wstring>(info_.duration) + L"]";\r
+               return L"transition";\r
        }\r
 };\r
 \r

diff --git a/core/producer/transition/transition_producer.h b/core/producer/transition/transition_producer.h
index 7351aaf7b9ffbbccd4ec8269eb8a98849bd65607..d8d7f50e0ff994b37cf9091b614934c0c5f89435 100644 (file)
--- a/core/producer/transition/transition_producer.h
+++ b/core/producer/transition/transition_producer.h
@@ -39,19 +39,6 @@ struct transition
                slide,\r
                wipe\r
        };\r
-\r
-       static std::wstring print(type t)\r
-       {\r
-               switch(t)\r
-               {\r
-               case transition::cut:   return L"cut";\r
-               case transition::mix:   return L"mix";\r
-               case transition::push:  return L"push";\r
-               case transition::slide: return L"slide";\r
-               case transition::wipe:  return L"wipe";\r
-               default:                                return L"";\r
-               }\r
-       }\r
 };\r
 \r
 struct transition_direction\r

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index bbc97195ae7065b53109ed33ccb82ba2785b7ce6..308e54de81f76d4547e99f766821a8cc0b05f1c5 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -220,7 +220,7 @@ public:
                , tail_(core::basic_frame::empty())             \r
                , frame_factory_(frame_factory)\r
                , format_desc_(frame_factory->get_video_format_desc())\r
-               , executor_(L"flash_producer")\r
+               , executor_(L"flash_producer", true)\r
        {       \r
                if(!boost::filesystem::exists(filename))\r
                        BOOST_THROW_EXCEPTION(file_not_found() << boost::errinfo_file_name(narrow(filename)));  \r
@@ -235,7 +235,6 @@ public:
                });\r
 \r
                fps_ = 0;\r
-               executor_.start();\r
        }\r
 \r
        ~flash_producer()\r