/*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
*\r
* This file is part of CasparCG (www.casparcg.com).\r
*\r
#include <common/filesystem/polling_filesystem_monitor.h>\r
\r
#include <core/mixer/gpu/ogl_device.h>\r
+#include <core/mixer/audio/audio_util.h>\r
+#include <core/mixer/mixer.h>\r
#include <core/video_channel.h>\r
#include <core/producer/stage.h>\r
#include <core/consumer/output.h>\r
+#include <core/consumer/synchronizing/synchronizing_consumer.h>\r
#include <core/thumbnail_generator.h>\r
\r
#include <modules/bluefish/bluefish.h>\r
#include <modules/decklink/decklink.h>\r
#include <modules/ffmpeg/ffmpeg.h>\r
#include <modules/flash/flash.h>\r
-#include <modules/oal/oal.h>\r
+#include <modules/portaudio/portaudio.h>\r
#include <modules/ogl/ogl.h>\r
+#include <modules/newtek/newtek.h>\r
#include <modules/silverlight/silverlight.h>\r
#include <modules/image/image.h>\r
#include <modules/image/consumer/image_consumer.h>\r
\r
-#include <modules/oal/consumer/oal_consumer.h>\r
+#include <modules/portaudio/consumer/portaudio_consumer.h>\r
#include <modules/bluefish/consumer/bluefish_consumer.h>\r
+#include <modules/newtek/consumer/newtek_ivga_consumer.h>\r
#include <modules/decklink/consumer/decklink_consumer.h>\r
+#include <modules/decklink/consumer/blocking_decklink_consumer.h>\r
#include <modules/ogl/consumer/ogl_consumer.h>\r
#include <modules/ffmpeg/consumer/ffmpeg_consumer.h>\r
\r
#include <protocol/CLK/CLKProtocolStrategy.h>\r
#include <protocol/util/AsyncEventServer.h>\r
#include <protocol/util/stateful_protocol_strategy_wrapper.h>\r
-#include <protocol/osc/server.h>\r
+#include <protocol/osc/client.h>\r
+#include <protocol/asio/io_service_manager.h>\r
\r
#include <boost/algorithm/string.hpp>\r
#include <boost/lexical_cast.hpp>\r
\r
struct server::implementation : boost::noncopyable\r
{\r
- core::monitor::subject monitor_subject_;\r
+ protocol::asio::io_service_manager io_service_manager_;\r
+ safe_ptr<core::monitor::subject> monitor_subject_;\r
boost::promise<bool>& shutdown_server_now_;\r
safe_ptr<ogl_device> ogl_;\r
std::vector<safe_ptr<IO::AsyncEventServer>> async_servers_; \r
- std::vector<osc::server> osc_servers_;\r
+ std::shared_ptr<IO::AsyncEventServer> primary_amcp_server_;\r
+ osc::client osc_client_;\r
+ std::vector<std::shared_ptr<void>> predefined_osc_subscriptions_;\r
std::vector<safe_ptr<video_channel>> channels_;\r
std::shared_ptr<thumbnail_generator> thumbnail_generator_;\r
\r
implementation(boost::promise<bool>& shutdown_server_now)\r
: shutdown_server_now_(shutdown_server_now)\r
, ogl_(ogl_device::create())\r
- { \r
+ , osc_client_(io_service_manager_.service())\r
+ {\r
+ setup_audio(env::properties());\r
+\r
ffmpeg::init();\r
CASPAR_LOG(info) << L"Initialized ffmpeg module.";\r
\r
\r
decklink::init(); \r
CASPAR_LOG(info) << L"Initialized decklink module.";\r
- \r
- oal::init(); \r
- CASPAR_LOG(info) << L"Initialized oal module.";\r
+\r
+ portaudio::init();\r
+ CASPAR_LOG(info) << L"Initialized portaudio module.";\r
\r
+ newtek::init();\r
+ CASPAR_LOG(info) << L"Initialized newtek module.";\r
+\r
ogl::init(); \r
CASPAR_LOG(info) << L"Initialized ogl module.";\r
\r
- image::init(); \r
- CASPAR_LOG(info) << L"Initialized image module.";\r
-\r
flash::init(); \r
CASPAR_LOG(info) << L"Initialized flash module.";\r
\r
+ image::init(); \r
+ CASPAR_LOG(info) << L"Initialized image module.";\r
+\r
setup_channels(env::properties());\r
CASPAR_LOG(info) << L"Initialized channels.";\r
\r
\r
setup_controllers(env::properties());\r
CASPAR_LOG(info) << L"Initialized controllers.";\r
+\r
+ setup_osc(env::properties());\r
+ CASPAR_LOG(info) << L"Initialized osc.";\r
}\r
\r
~implementation()\r
{ \r
- ffmpeg::uninit();\r
-\r
+ thumbnail_generator_.reset();\r
+ primary_amcp_server_.reset();\r
async_servers_.clear();\r
+ destroy_producers_synchronously();\r
channels_.clear();\r
+\r
+ ffmpeg::uninit();\r
+ }\r
+\r
+ void setup_audio(const boost::property_tree::wptree& pt)\r
+ {\r
+ register_default_channel_layouts(default_channel_layout_repository());\r
+ register_default_mix_configs(default_mix_config_repository());\r
+\r
+ auto channel_layouts =\r
+ pt.get_child_optional(L"configuration.audio.channel-layouts");\r
+ auto mix_configs =\r
+ pt.get_child_optional(L"configuration.audio.mix-configs");\r
+\r
+ if (channel_layouts)\r
+ parse_channel_layouts(\r
+ default_channel_layout_repository(), *channel_layouts);\r
+\r
+ if (mix_configs)\r
+ parse_mix_configs(\r
+ default_mix_config_repository(), *mix_configs);\r
}\r
\r
void setup_channels(const boost::property_tree::wptree& pt)\r
auto format_desc = video_format_desc::get(widen(xml_channel.second.get(L"video-mode", L"PAL"))); \r
if(format_desc.format == video_format::invalid)\r
BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Invalid video-mode."));\r
+ auto audio_channel_layout = default_channel_layout_repository().get_by_name(\r
+ boost::to_upper_copy(xml_channel.second.get(L"channel-layout", L"STEREO")));\r
\r
- channels_.push_back(make_safe<video_channel>(channels_.size()+1, format_desc, ogl_));\r
+ channels_.push_back(make_safe<video_channel>(channels_.size()+1, format_desc, ogl_, audio_channel_layout));\r
\r
- channels_.back()->monitor_output().link_target(&monitor_subject_);\r
+ channels_.back()->monitor_output().attach_parent(monitor_subject_);\r
+ channels_.back()->mixer()->set_straight_alpha_output(\r
+ xml_channel.second.get(L"straight-alpha-output", false));\r
\r
- BOOST_FOREACH(auto& xml_consumer, xml_channel.second.get_child(L"consumers"))\r
- {\r
- try\r
+ create_consumers(\r
+ xml_channel.second.get_child(L"consumers"),\r
+ [&] (const safe_ptr<core::frame_consumer>& consumer)\r
{\r
- auto name = xml_consumer.first;\r
- if(name == L"screen")\r
- channels_.back()->output()->add(ogl::create_consumer(xml_consumer.second)); \r
- else if(name == L"bluefish") \r
- channels_.back()->output()->add(bluefish::create_consumer(xml_consumer.second)); \r
- else if(name == L"decklink") \r
- channels_.back()->output()->add(decklink::create_consumer(xml_consumer.second)); \r
- else if(name == L"file") \r
- channels_.back()->output()->add(ffmpeg::create_consumer(xml_consumer.second)); \r
- else if(name == L"system-audio")\r
- channels_.back()->output()->add(oal::create_consumer()); \r
- else if(name != L"<xmlcomment>")\r
- CASPAR_LOG(warning) << "Invalid consumer: " << widen(name); \r
- }\r
- catch(...)\r
- {\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
- }\r
- } \r
+ channels_.back()->output()->add(consumer);\r
+ });\r
}\r
\r
// Dummy diagnostics channel\r
if(env::properties().get(L"configuration.channel-grid", false))\r
- channels_.push_back(make_safe<video_channel>(channels_.size()+1, core::video_format_desc::get(core::video_format::x576p2500), ogl_));\r
+ channels_.push_back(make_safe<video_channel>(channels_.size()+1, core::video_format_desc::get(core::video_format::x576p2500), ogl_, default_channel_layout_repository().get_by_name(L"STEREO")));\r
+ }\r
+\r
+ template<typename Base>\r
+ std::vector<safe_ptr<Base>> create_consumers(const boost::property_tree::wptree& pt)\r
+ {\r
+ std::vector<safe_ptr<Base>> consumers;\r
+\r
+ create_consumers(pt, [&] (const safe_ptr<core::frame_consumer>& consumer)\r
+ {\r
+ consumers.push_back(dynamic_pointer_cast<Base>(consumer));\r
+ });\r
+\r
+ return consumers;\r
+ }\r
+\r
+ template<class Func>\r
+ void create_consumers(const boost::property_tree::wptree& pt, const Func& on_consumer)\r
+ {\r
+ BOOST_FOREACH(auto& xml_consumer, pt)\r
+ {\r
+ try\r
+ {\r
+ auto name = xml_consumer.first;\r
+\r
+ if (name == L"screen")\r
+ on_consumer(ogl::create_consumer(xml_consumer.second));\r
+ else if (name == L"bluefish") \r
+ on_consumer(bluefish::create_consumer(xml_consumer.second)); \r
+ else if (name == L"decklink") \r
+ on_consumer(decklink::create_consumer(xml_consumer.second)); \r
+ else if (name == L"newtek-ivga") \r
+ on_consumer(newtek::create_ivga_consumer(xml_consumer.second)); \r
+ else if (name == L"blocking-decklink")\r
+ on_consumer(decklink::create_blocking_consumer(xml_consumer.second)); \r
+ else if (name == L"file" || name == L"stream") \r
+ on_consumer(ffmpeg::create_consumer(xml_consumer.second)); \r
+ else if (name == L"system-audio")\r
+ on_consumer(portaudio::create_consumer());\r
+ else if (name == L"synchronizing")\r
+ on_consumer(make_safe<core::synchronizing_consumer>(\r
+ create_consumers<core::frame_consumer>(\r
+ xml_consumer.second)));\r
+ else if (name != L"<xmlcomment>")\r
+ CASPAR_LOG(warning) << "Invalid consumer: " << widen(name); \r
+ }\r
+ catch(...)\r
+ {\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\r
+ }\r
+ }\r
}\r
\r
void setup_controllers(const boost::property_tree::wptree& pt)\r
auto asyncbootstrapper = make_safe<IO::AsyncEventServer>(create_protocol(protocol), port);\r
asyncbootstrapper->Start();\r
async_servers_.push_back(asyncbootstrapper);\r
- }\r
- else if(name == L"udp")\r
- { \r
- const auto address = xml_controller.second.get(L"address", L"127.0.0.1");\r
- const auto port = xml_controller.second.get<unsigned short>(L"port", 5253);\r
\r
- osc_servers_.push_back(osc::server(boost::asio::ip::udp::endpoint(boost::asio::ip::address_v4::from_string(narrow(address)), port), monitor_subject_));\r
+ if (!primary_amcp_server_ && boost::iequals(protocol, L"AMCP"))\r
+ primary_amcp_server_ = asyncbootstrapper;\r
}\r
else\r
CASPAR_LOG(warning) << "Invalid controller: " << widen(name); \r
}\r
}\r
\r
+ void setup_osc(const boost::property_tree::wptree& pt)\r
+ { \r
+ using boost::property_tree::wptree;\r
+ using namespace boost::asio::ip;\r
+\r
+ monitor_subject_->attach_parent(osc_client_.sink());\r
+ \r
+ auto default_port =\r
+ pt.get<unsigned short>(L"configuration.osc.default-port", 6250);\r
+ auto predefined_clients =\r
+ pt.get_child_optional(L"configuration.osc.predefined-clients");\r
+\r
+ if (predefined_clients)\r
+ {\r
+ BOOST_FOREACH(auto& predefined_client, *predefined_clients)\r
+ {\r
+ const auto address =\r
+ predefined_client.second.get<std::wstring>(L"address");\r
+ const auto port =\r
+ predefined_client.second.get<unsigned short>(L"port");\r
+ predefined_osc_subscriptions_.push_back(\r
+ osc_client_.get_subscription_token(udp::endpoint(\r
+ address_v4::from_string(narrow(address)),\r
+ port)));\r
+ }\r
+ }\r
+\r
+ if (primary_amcp_server_)\r
+ primary_amcp_server_->add_lifecycle_factory(\r
+ [=] (const std::string& ipv4_address)\r
+ -> std::shared_ptr<void>\r
+ {\r
+ using namespace boost::asio::ip;\r
+\r
+ return osc_client_.get_subscription_token(\r
+ udp::endpoint(\r
+ address_v4::from_string(ipv4_address),\r
+ default_port));\r
+ });\r
+ }\r
+\r
void setup_thumbnail_generation(const boost::property_tree::wptree& pt)\r
{\r
if (!pt.get(L"configuration.thumbnails.generate-thumbnails", true))\r
\r
auto scan_interval_millis = pt.get(L"configuration.thumbnails.scan-interval-millis", 5000);\r
\r
- polling_filesystem_monitor_factory monitor_factory(scan_interval_millis);\r
+ polling_filesystem_monitor_factory monitor_factory(\r
+ io_service_manager_.service(),\r
+ scan_interval_millis);\r
thumbnail_generator_.reset(new thumbnail_generator(\r
monitor_factory, \r
env::media_folder(),\r
return impl_->thumbnail_generator_;\r
}\r
\r
-core::monitor::source& server::monitor_output()\r
+core::monitor::subject& server::monitor_output()\r
{\r
- return impl_->monitor_subject_;\r
+ return *impl_->monitor_subject_;\r
}\r
\r
}
\ No newline at end of file
projects / casparcg / blobdiff