[streaming_consumer] Started the process of retiring ffmpeg_consumer so that streamin...

[casparcg] / shell / main.cpp

diff --git a/shell/main.cpp b/shell/main.cpp
index a811eb7d508b91c82786bef53e5724682c94eedc..2eac1b8b646fc52a9d0aff964189d3bfd30128f1 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -70,6 +70,7 @@
 #include <set>
 
 #include <csignal>
+#include <clocale>
 
 using namespace caspar;
        
@@ -79,6 +80,9 @@ void setup_global_locale()
        gen.categories(boost::locale::codepage_facet);
 
        std::locale::global(gen(""));
+
+       // sscanf is used in for example FFmpeg where we want decimals to be parsed as .
+       std::setlocale(LC_ALL, "C");
 }
 
 void print_info()
@@ -119,6 +123,7 @@ void do_run(
 
                if(boost::iequals(wcmd, L"EXIT") || boost::iequals(wcmd, L"Q") || boost::iequals(wcmd, L"QUIT") || boost::iequals(wcmd, L"BYE"))
                {
+                       CASPAR_LOG(info) << L"Received message from Console: " << wcmd << L"\\r\\n";
                        should_wait_for_keypress = true;
                        shutdown_server_now.set_value(false);   //false to not restart
                        break;
@@ -216,6 +221,9 @@ bool run(const std::wstring& config_file_name, tbb::atomic<bool>& should_wait_fo
        // Create server object which initializes channels, protocols and controllers.
        std::unique_ptr<server> caspar_server(new server(shutdown_server_now));
 
+       // For example CEF resets the global locale, so this is to reset it back to "our" preference.
+       setup_global_locale();
+
        // Print environment information.
        print_system_info(caspar_server->get_system_info_provider_repo());
 
@@ -332,7 +340,7 @@ int main(int argc, char** argv)
                
                CASPAR_LOG(info) << "Successfully shutdown CasparCG Server.";
 
-               if (!should_wait_for_keypress)
+               if (should_wait_for_keypress)
                        wait_for_keypress();
        }
        catch(const boost::property_tree::file_parser_error& e)