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

diff --git a/README.txt b/README.txt
index 8714842c8c407b35eb4c93958621d6ad5a7c3cd7..2e30261ebb458527e7819710d64a81a750fecc47 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -13,47 +13,33 @@ http://casparcg.com/
 http://casparcg.com/forum/\r
 http://casparcg.com/wiki/\r
 \r
-CasparCG uses libraries from the FFmpeg project under the \r
-GPLv2 Licence. FFmpeg is a trademark of Fabrice Bellard, originator \r
-of the FFmpeg project. Get more info about FFmpeg at: \r
-http://ffmpeg.org/\r
+CasparCG uses FFmpeg(http://ffmpeg.org/) under the GPLv2 Licence. \r
+FFmpeg is a trademark of Fabrice Bellard, originator of the FFmpeg project.\r
 \r
-CasparCG uses the Threading Building Blocks library under\r
-the GPLv2 Licence. Get more info on Threading Building Blocks at: \r
-http://www.threadingbuildingblocks.org/\r
+CasparCG uses the Threading Building Blocks(http://www.threadingbuildingblocks.org/) library under the GPLv2 Licence.\r
 \r
-CasparCG uses FreeImage under the GPLv2. Get more info about FreeImage at: \r
-http://freeimage.sourceforge.net/\r
+CasparCG uses FreeImage(http://freeimage.sourceforge.net/) under the GPLv2.\r
 \r
-CasparCG uses SFML under the zlib/libpng License. Get more info about SFML at:\r
-http://www.sfml-dev.org/\r
+CasparCG uses SFML(http://www.sfml-dev.org/) under the zlib/libpng License.\r
 \r
-CasparCG uses Glee under the modified BSD license. Get more info about Glee at:\r
-http://elf-stone.com/\r
+CasparCG uses Glee(http://elf-stone.com/) under the modified BSD license.\r
 \r
-CasparCG uses boost under the Boost Software License, Version 1.0. Get more info about boost at:\r
-http://www.boost.org/\r
+CasparCG uses boost(http://www.boost.org/) under the Boost Software License, Version 1.0.\r
 \r
-AUTHORS\r
+AUTHORS - People who have written the CasparCG Server Software (sorted alphabetically by last name).\r
 ================================================\r
 \r
-These are the names of the people who have written the CasparCG Server Software.\r
-The names are sorted alphabetically by last name.\r
-\r
        Niklas Andersson (1.0-1.8)\r
        Robert Nagy              (1.7-2.0+)\r
        Peter Karlsson   (2.0+)\r
 \r
-CREDITS\r
+CREDITS - People who have contributed to the CasparCG Project (sorted alphabetically by last name).\r
 ================================================\r
 \r
-These are the names of the people who have contributed to the\r
-CasparCG Project. The names are sorted alphabetically by last name.\r
-\r
-  Niklas Andersson             \r
-  Jonas Gustafsson             \r
-  Jonas Hummelstrand   \r
-  Andreas Jeansson             \r
-  Peter Karlsson               \r
-  Robert Nagy                  \r
-  Olle Soprani\r
+       Niklas  Andersson               \r
+       Jonas Gustafsson                \r
+       Jonas Hummelstrand      \r
+       Andreas Jeansson                \r
+       Peter Karlsson          \r
+       Robert Nagy                     \r
+       Olle Soprani\r

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index 3fd1318d52cd05fb4e296e4caf78129c53e170c2..1b4a874bcbeb9646b4bed13b7993a3fa502c03aa 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -241,6 +241,7 @@ public:
                for(size_t n = 0; n < reserved_frames_.size(); ++n)\r
                        reserved_frames_[n] = std::make_shared<blue_dma_buffer>(format_desc_.size, n);          \r
                                \r
+               executor_.start();\r
                active_ = executor_.begin_invoke([]{});\r
 \r
                CASPAR_LOG(info) << print() << TEXT(" Successfully initialized for ") << format_desc_ << TEXT(".");\r

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index 6d43a044eeeb411ca7414240e60d77fa65f793aa..9decd746c9e1754a2bfa4691e136cee2a8821122 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -223,7 +223,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
@@ -232,7 +232,6 @@ public:
                graph_ = diagnostics::create_graph([this]{return print();});\r
                graph_->set_color("output-buffer", diagnostics::color(0.0f, 1.0f, 0.0f));\r
                \r
-               executor_.start();\r
                executor_.begin_invoke([=]\r
                {\r
                        init_renderer();\r

diff --git a/modules/ogl/consumer/ogl_consumer.cpp b/modules/ogl/consumer/ogl_consumer.cpp
index edc8297de5fd4224a9868fa969aa2c308ae44970..e52674152f47c5777791a11cf788a67b474e3256 100644 (file)
--- a/modules/ogl/consumer/ogl_consumer.cpp
+++ b/modules/ogl/consumer/ogl_consumer.cpp
@@ -144,6 +144,7 @@ public:
                if(screen_index != 0)\r
                        CASPAR_LOG(warning) << print() << " only supports screen_index=0 for non-Win32";\r
 #endif         \r
+               executor_.start();\r
                executor_.invoke([=]\r
                {\r
                        window_.Create(sf::VideoMode(screen_width_, screen_height_, 32), narrow(print()), windowed_ ? sf::Style::Resize : sf::Style::Fullscreen);\r

diff --git a/modules/silverlight/producer/silverlight_producer.cpp b/modules/silverlight/producer/silverlight_producer.cpp
index 663167e55dc0bd2ce86e3fc8bb042e538a29b10f..cef09fd3fb9d498e03a73d680d5f8057a7c32553 100644 (file)
--- a/modules/silverlight/producer/silverlight_producer.cpp
+++ b/modules/silverlight/producer/silverlight_producer.cpp
@@ -142,6 +142,7 @@ public:
 \r
        silverlight_producer(const safe_ptr<core::frame_factory>& frame_factory) : executor_(L"silverlight")\r
        {\r
+               executor_.start();\r
                executor_.invoke([=]\r
                {\r
                        renderer_.reset(new silverlight_renderer(frame_factory));\r

diff --git a/protocol/cii/CIIProtocolStrategy.cpp b/protocol/cii/CIIProtocolStrategy.cpp
index 80363827abb86c719406d6b1733dca9270f0e45c..d37a457f1ce83abc0fbe707e40e4000a8a5a90e4 100644 (file)
--- a/protocol/cii/CIIProtocolStrategy.cpp
+++ b/protocol/cii/CIIProtocolStrategy.cpp
@@ -42,7 +42,9 @@ const std::wstring CIIProtocolStrategy::MessageDelimiter = TEXT("\r\n");
 const TCHAR CIIProtocolStrategy::TokenDelimiter = TEXT('\\');\r
 \r
 CIIProtocolStrategy::CIIProtocolStrategy(const std::vector<safe_ptr<core::channel>>& channels) : pChannel_(channels.at(0)), executor_(L"CIIProtocolStrategy")\r
-{}\r
+{\r
+       executor_.start();\r
+}\r
 \r
 void CIIProtocolStrategy::Parse(const TCHAR* pData, int charCount, IO::ClientInfoPtr pClientInfo) \r
 {\r