Removed unnecessary exception throwing for absent template-hosts element in config...

[casparcg] / core / video_channel.cpp

diff --git a/core/video_channel.cpp b/core/video_channel.cpp
index 4cad33609b05123de58318adbce71ce07c1ca503..059e8d631e96044e195328ef03e59c565fa8ac47 100644 (file)
--- a/core/video_channel.cpp
+++ b/core/video_channel.cpp
@@ -28,6 +28,7 @@
 #include "consumer/output.h"\r
 #include "mixer/mixer.h"\r
 #include "mixer/gpu/ogl_device.h"\r
+#include "mixer/audio/audio_util.h"\r
 #include "producer/stage.h"\r
 \r
 #include <common/diagnostics/graph.h>\r
@@ -41,6 +42,7 @@ namespace caspar { namespace core {
 \r
 struct video_channel::implementation : boost::noncopyable\r
 {\r
+       video_channel&                                                  self_;\r
        const int                                                               index_;\r
        video_format_desc                                               format_desc_;\r
        const safe_ptr<ogl_device>                              ogl_;\r
@@ -49,15 +51,19 @@ struct video_channel::implementation : boost::noncopyable
        const safe_ptr<caspar::core::output>    output_;\r
        const safe_ptr<caspar::core::mixer>             mixer_;\r
        const safe_ptr<caspar::core::stage>             stage_;\r
+\r
+       monitor::subject                                                monitor_subject_;\r
        \r
 public:\r
-       implementation(int index, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl)  \r
-               : index_(index)\r
+       implementation(video_channel& self, int index, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl, const channel_layout& audio_channel_layout)  \r
+               : self_(self)\r
+               , index_(index)\r
                , format_desc_(format_desc)\r
                , ogl_(ogl)\r
                , output_(new caspar::core::output(graph_, format_desc, index))\r
-               , mixer_(new caspar::core::mixer(graph_, output_, format_desc, ogl))\r
+               , mixer_(new caspar::core::mixer(graph_, output_, format_desc, ogl, audio_channel_layout))\r
                , stage_(new caspar::core::stage(graph_, mixer_, format_desc))  \r
+               , monitor_subject_("/channel/" + boost::lexical_cast<std::string>(index))\r
        {\r
                graph_->set_text(print());\r
                diagnostics::register_graph(graph_);\r
@@ -65,6 +71,8 @@ public:
                for(int n = 0; n < std::max(1, env::properties().get(L"configuration.pipeline-tokens", 2)); ++n)\r
                        stage_->spawn_token();\r
 \r
+               stage_->monitor_output().link_target(&monitor_subject_);\r
+\r
                CASPAR_LOG(info) << print() << " Successfully Initialized.";\r
        }\r
        \r
@@ -116,7 +124,8 @@ public:
        }\r
 };\r
 \r
-video_channel::video_channel(int index, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl) : impl_(new implementation(index, format_desc, ogl)){}\r
+video_channel::video_channel(int index, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl, const channel_layout& audio_channel_layout) \r
+       : impl_(new implementation(*this, index, format_desc, ogl, audio_channel_layout)){}\r
 safe_ptr<stage> video_channel::stage() { return impl_->stage_;} \r
 safe_ptr<mixer> video_channel::mixer() { return impl_->mixer_;} \r
 safe_ptr<output> video_channel::output() { return impl_->output_;} \r
@@ -124,5 +133,5 @@ video_format_desc video_channel::get_video_format_desc() const{return impl_->for
 void video_channel::set_video_format_desc(const video_format_desc& format_desc){impl_->set_video_format_desc(format_desc);}\r
 boost::property_tree::wptree video_channel::info() const{return impl_->info();}\r
 int video_channel::index() const {return impl_->index_;}\r
-\r
+monitor::source& video_channel::monitor_output(){return impl_->monitor_subject_;}\r
 }}
\ No newline at end of file