x64: Builds in debug without image, oal and ogl projects. Flash doesn't work.

[casparcg] / core / video_channel.cpp

diff --git a/core/video_channel.cpp b/core/video_channel.cpp
index d20615e873ce209cc67c3bed7ea3e72aa65d45c8..458a59d141f82e0c7efd85b29cbdaec856af0aa0 100644 (file)
--- a/core/video_channel.cpp
+++ b/core/video_channel.cpp
@@ -62,7 +62,7 @@ public:
                graph_->set_text(print());\r
                diagnostics::register_graph(graph_);\r
 \r
-               for(int n = 0; n < std::max(1, env::properties().get("configuration.pipeline-tokens", 2)); ++n)\r
+               for(int n = 0; n < std::max(1, env::properties().get(L"configuration.pipeline-tokens", 2)); ++n)\r
                        stage_->spawn_token();\r
 \r
                CASPAR_LOG(info) << print() << " Successfully Initialized.";\r
@@ -85,14 +85,14 @@ public:
                format_desc_ = format_desc;\r
        }\r
                \r
-       std::string print() const\r
+       std::wstring print() const\r
        {\r
-               return "video_channel[" + boost::lexical_cast<std::string>(index_) + "|" +  format_desc_.name + "]";\r
+               return L"video_channel[" + boost::lexical_cast<std::wstring>(index_) + L"|" +  format_desc_.name + L"]";\r
        }\r
 \r
-       boost::property_tree::ptree info() const\r
+       boost::property_tree::wptree info() const\r
        {\r
-               boost::property_tree::ptree info;\r
+               boost::property_tree::wptree info;\r
 \r
                auto stage_info  = stage_->info();\r
                auto mixer_info  = mixer_->info();\r
@@ -102,10 +102,10 @@ public:
                mixer_info.timed_wait(boost::posix_time::seconds(2));\r
                output_info.timed_wait(boost::posix_time::seconds(2));\r
                \r
-               info.add("video-mode", format_desc_.name);\r
-               info.add_child("stage", stage_info.get());\r
-               info.add_child("mixer", mixer_info.get());\r
-               info.add_child("output", output_info.get());\r
+               info.add(L"video-mode", format_desc_.name);\r
+               info.add_child(L"stage", stage_info.get());\r
+               info.add_child(L"mixer", mixer_info.get());\r
+               info.add_child(L"output", output_info.get());\r
    \r
                return info;                       \r
        }\r
@@ -117,6 +117,6 @@ safe_ptr<mixer> video_channel::mixer() { return impl_->mixer_;}
 safe_ptr<output> video_channel::output() { return impl_->output_;} \r
 video_format_desc video_channel::get_video_format_desc() const{return impl_->format_desc_;}\r
 void video_channel::set_video_format_desc(const video_format_desc& format_desc){impl_->set_video_format_desc(format_desc);}\r
-boost::property_tree::ptree video_channel::info() const{return impl_->info();}\r
+boost::property_tree::wptree video_channel::info() const{return impl_->info();}\r
 \r
 }}
\ No newline at end of file