2.0. Updated namespaces.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1351 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/bluefish/bluefish.cpp b/modules/bluefish/bluefish.cpp
index a658786c5696f912d41d5f0dc49b8dc73c470b0c..73a7c8bc37a31f38d9efdeee4c88f4d9480d0ba5 100644 (file)
--- a/modules/bluefish/bluefish.cpp
+++ b/modules/bluefish/bluefish.cpp
@@ -30,16 +30,16 @@
 \r
 #include <boost/lexical_cast.hpp>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace bluefish {\r
 \r
-void init_bluefish()\r
+void init()\r
 {\r
        try\r
        {\r
                blue_initialize();\r
                core::register_consumer_factory([](const std::vector<std::wstring>& params)\r
                {\r
-                       return create_bluefish_consumer(params);\r
+                       return create_consumer(params);\r
                });\r
        }\r
        catch(...)\r
@@ -49,7 +49,7 @@ void init_bluefish()
        }\r
 }\r
 \r
-std::wstring get_bluefish_version()\r
+std::wstring get_version()\r
 {\r
        try\r
        {\r
@@ -66,7 +66,7 @@ std::wstring get_bluefish_version()
        return widen(std::string(BlueVelvetVersion()));\r
 }\r
 \r
-std::vector<std::wstring> get_bluefish_device_list()\r
+std::vector<std::wstring> get_device_list()\r
 {\r
        std::vector<std::wstring> devices;\r
 \r
@@ -86,4 +86,5 @@ std::vector<std::wstring> get_bluefish_device_list()
 \r
        return devices;\r
 }\r
-}
\ No newline at end of file
+\r
+}}
\ No newline at end of file

diff --git a/modules/bluefish/bluefish.h b/modules/bluefish/bluefish.h
index cbd0b98944c6ce98124c5980508790adc396ed77..9e3b93d70873f75fc8ee1b19e68fcb7755ed3b6f 100644 (file)
--- a/modules/bluefish/bluefish.h
+++ b/modules/bluefish/bluefish.h
@@ -22,11 +22,11 @@
 #include <string>\r
 #include <vector>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace bluefish {\r
 \r
-void init_bluefish();\r
+void init();\r
 \r
-std::wstring get_bluefish_version();\r
-std::vector<std::wstring> get_bluefish_device_list();\r
+std::wstring get_version();\r
+std::vector<std::wstring> get_device_list();\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index d2e5a7f07386e1a382b6c380c5b55a2daaf9bddd..62e840670f79c40b74d0479b06d3c96e5109bea8 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -43,7 +43,7 @@
 #include <memory>\r
 #include <array>\r
 \r
-namespace caspar { \r
+namespace caspar { namespace bluefish { \r
                        \r
 struct bluefish_consumer : boost::noncopyable\r
 {\r
@@ -356,7 +356,7 @@ public:
        }\r
 };     \r
 \r
-safe_ptr<core::frame_consumer> create_bluefish_consumer(const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params)\r
 {\r
        if(params.size() < 1 || params[0] != L"BLUEFISH")\r
                return core::frame_consumer::empty();\r
@@ -369,7 +369,7 @@ safe_ptr<core::frame_consumer> create_bluefish_consumer(const std::vector<std::w
        return make_safe<bluefish_consumer_proxy>(device_index, embedded_audio, key_only);\r
 }\r
 \r
-safe_ptr<core::frame_consumer> create_bluefish_consumer(const boost::property_tree::ptree& ptree) \r
+safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::ptree& ptree) \r
 {      \r
        const auto device_index         = ptree.get("device",             1);\r
        const auto embedded_audio       = ptree.get("embedded-audio", false);\r
@@ -378,4 +378,4 @@ safe_ptr<core::frame_consumer> create_bluefish_consumer(const boost::property_tr
        return make_safe<bluefish_consumer_proxy>(device_index, embedded_audio, key_only);\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/bluefish/consumer/bluefish_consumer.h b/modules/bluefish/consumer/bluefish_consumer.h
index 90249d4716fe6b185f22af751e652a6c97c71312..8b954580e62e154b2985fc973cc0cd48a61995bd 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.h
+++ b/modules/bluefish/consumer/bluefish_consumer.h
@@ -30,8 +30,10 @@ namespace caspar {
 namespace core {\r
        struct frame_consumer;\r
 }\r
-                       \r
-safe_ptr<core::frame_consumer> create_bluefish_consumer(const std::vector<std::wstring>& params);\r
-safe_ptr<core::frame_consumer> create_bluefish_consumer(const boost::property_tree::ptree& ptree);\r
+        \r
+namespace bluefish {\r
 \r
-}
\ No newline at end of file
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params);\r
+safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::ptree& ptree);\r
+\r
+}}
\ No newline at end of file

diff --git a/modules/bluefish/util/blue_velvet.cpp b/modules/bluefish/util/blue_velvet.cpp
index b4c5651d30b7478c5f393560345c6c41245ce39e..f2accffbd1d4762287664ee4656108731dbfa183 100644 (file)
--- a/modules/bluefish/util/blue_velvet.cpp
+++ b/modules/bluefish/util/blue_velvet.cpp
@@ -6,7 +6,7 @@
 \r
 #include <core/video_format.h>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace bluefish {\r
        \r
 CBlueVelvet4* (*BlueVelvetFactory4)() = nullptr;\r
 void (*BlueVelvetDestroy)(CBlueVelvet4* pObj) = nullptr;\r
@@ -165,4 +165,4 @@ safe_ptr<CBlueVelvet4> create_blue(size_t device_index)
        return blue;\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/bluefish/util/blue_velvet.h b/modules/bluefish/util/blue_velvet.h
index 0fee25ef6b44b0b75489da5234c627ba9e320b58..79270729ff6742dd67de5ee2a4261ca124127a1b 100644 (file)
--- a/modules/bluefish/util/blue_velvet.h
+++ b/modules/bluefish/util/blue_velvet.h
@@ -35,6 +35,8 @@ struct video_format_desc;
 \r
 }\r
 \r
+namespace bluefish {\r
+\r
 extern const char* (*BlueVelvetVersion)();\r
 extern BLUE_UINT32 (*encode_hanc_frame)(struct hanc_stream_info_struct * hanc_stream_ptr, void * audio_pcm_ptr,BLUE_UINT32 no_audio_ch,BLUE_UINT32 no_audio_samples,BLUE_UINT32 nTypeOfSample,BLUE_UINT32 emb_audio_flag);\r
 extern BLUE_UINT32 (*encode_hanc_frame_ex)(BLUE_UINT32 card_type, struct hanc_stream_info_struct * hanc_stream_ptr, void * audio_pcm_ptr, BLUE_UINT32 no_audio_ch,     BLUE_UINT32 no_audio_samples, BLUE_UINT32 nTypeOfSample, BLUE_UINT32 emb_audio_flag);\r
@@ -56,4 +58,4 @@ int set_card_property(T& pSdk, ULONG prop, ULONG value)
        return (pSdk->SetCardProperty(prop,variantValue));\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/bluefish/util/memory.h b/modules/bluefish/util/memory.h
index d86874a36daa9ceacfc89340917a5997bc30da5a..018477da558d83a1a06df1dfd2437ab0ce1fa50d 100644 (file)
--- a/modules/bluefish/util/memory.h
+++ b/modules/bluefish/util/memory.h
@@ -27,7 +27,7 @@
 \r
 #include <vector>\r
 \r
-namespace caspar { \r
+namespace caspar { namespace bluefish {\r
        \r
 static const size_t MAX_HANC_BUFFER_SIZE = 256*1024;\r
 static const size_t MAX_VBI_BUFFER_SIZE = 36*1920*4;\r
@@ -59,4 +59,4 @@ private:
 };\r
 typedef std::shared_ptr<blue_dma_buffer> blue_dma_buffer_ptr;\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index 03131d31031bba151af2b1aa9199bc420945a9be..d4abdfa526204955e90d243f4dbd97fa3ee2efc5 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -43,7 +43,7 @@
 #include <boost/circular_buffer.hpp>\r
 #include <boost/timer.hpp>\r
 \r
-namespace caspar { \r
+namespace caspar { namespace decklink { \r
        \r
 struct configuration\r
 {\r
@@ -452,7 +452,7 @@ public:
        }\r
 };     \r
 \r
-safe_ptr<core::frame_consumer> create_decklink_consumer(const std::vector<std::wstring>& params) \r
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params) \r
 {\r
        if(params.size() < 1 || params[0] != L"DECKLINK")\r
                return core::frame_consumer::empty();\r
@@ -470,7 +470,7 @@ safe_ptr<core::frame_consumer> create_decklink_consumer(const std::vector<std::w
        return make_safe<decklink_consumer_proxy>(config);\r
 }\r
 \r
-safe_ptr<core::frame_consumer> create_decklink_consumer(const boost::property_tree::ptree& ptree) \r
+safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::ptree& ptree) \r
 {\r
        configuration config;\r
 \r
@@ -483,7 +483,7 @@ safe_ptr<core::frame_consumer> create_decklink_consumer(const boost::property_tr
        return make_safe<decklink_consumer_proxy>(config);\r
 }\r
 \r
-}\r
+}}\r
 \r
 /*\r
 ##############################################################################\r

diff --git a/modules/decklink/consumer/decklink_consumer.h b/modules/decklink/consumer/decklink_consumer.h
index 3d8a9f3a19bbc8e1e48a946280cc3bf41b30dfa1..9597b615f01d796c1d4ba07c68cd83b01e71061b 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.h
+++ b/modules/decklink/consumer/decklink_consumer.h
@@ -28,13 +28,15 @@
 #include <string>\r
 #include <vector>\r
 \r
-namespace caspar { \r
+namespace caspar {\r
 \r
 namespace core {\r
        struct frame_consumer;\r
 }\r
-       \r
-safe_ptr<core::frame_consumer> create_decklink_consumer(const std::vector<std::wstring>& params);\r
-safe_ptr<core::frame_consumer> create_decklink_consumer(const boost::property_tree::ptree& ptree);\r
 \r
-}
\ No newline at end of file
+namespace decklink {\r
+\r
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params);\r
+safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::ptree& ptree);\r
+\r
+}}
\ No newline at end of file

diff --git a/modules/decklink/decklink.cpp b/modules/decklink/decklink.cpp
index cea6d03c6f0e7ff9632f9cfca70e3013be4ab850..94a8ba5561efc4509e51bae01f05296d535b1a01 100644 (file)
--- a/modules/decklink/decklink.cpp
+++ b/modules/decklink/decklink.cpp
@@ -40,15 +40,15 @@
 \r
 #pragma warning(push)\r
 \r
-namespace caspar{\r
+namespace caspar { namespace decklink {\r
 \r
-void init_decklink()\r
+void init()\r
 {\r
-       core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_decklink_consumer(params);});\r
-       core::register_producer_factory(create_decklink_producer);\r
+       core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_consumer(params);});\r
+       core::register_producer_factory(create_producer);\r
 }\r
 \r
-std::wstring get_decklink_version() \r
+std::wstring get_version() \r
 {\r
        std::wstring version = L"Not found";\r
 \r
@@ -65,7 +65,7 @@ std::wstring get_decklink_version()
        return version;\r
 }\r
 \r
-std::vector<std::wstring> get_decklink_device_list()\r
+std::vector<std::wstring> get_device_list()\r
 {\r
        std::vector<std::wstring> devices;\r
 \r
@@ -90,4 +90,4 @@ std::vector<std::wstring> get_decklink_device_list()
        return devices;\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/decklink/decklink.h b/modules/decklink/decklink.h
index 9cf0267aba6bca18517ddb092b715cde57c0fb1f..721a2e867e269af570918459436e2774ffda5588 100644 (file)
--- a/modules/decklink/decklink.h
+++ b/modules/decklink/decklink.h
@@ -22,11 +22,11 @@
 #include <string>\r
 #include <vector>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace decklink {\r
 \r
-void init_decklink();\r
+void init();\r
 \r
-std::wstring get_decklink_version();\r
-std::vector<std::wstring> get_decklink_device_list();\r
+std::wstring get_version();\r
+std::vector<std::wstring> get_device_list();\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index 420256641861cd0e3bbd44bbdd16fd89895defdd..902d78e210e30e1f1dd9681045747a47b7f14a0b 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -71,7 +71,7 @@ extern "C"
 \r
 #include <functional>\r
 \r
-namespace caspar { \r
+namespace caspar { namespace decklink {\r
                \r
 class decklink_producer : boost::noncopyable, public IDeckLinkInputCallback\r
 {      \r
@@ -91,9 +91,9 @@ class decklink_producer : boost::noncopyable, public IDeckLinkInputCallback
        tbb::concurrent_bounded_queue<safe_ptr<core::basic_frame>>      frame_buffer_;\r
 \r
        std::exception_ptr                                                                                      exception_;\r
-       filter                                                                                                          filter_;\r
+       ffmpeg::filter                                                                                          filter_;\r
                \r
-       frame_muxer                                                                                                     muxer_;\r
+       ffmpeg::frame_muxer                                                                                     muxer_;\r
 \r
 public:\r
        decklink_producer(const core::video_format_desc& format_desc, size_t device_index, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter)\r
@@ -104,7 +104,7 @@ public:
                , device_index_(device_index)\r
                , frame_factory_(frame_factory)\r
                , filter_(filter)\r
-               , muxer_(double_rate(filter) ? format_desc.fps * 2.0 : format_desc.fps, frame_factory)\r
+               , muxer_(ffmpeg::double_rate(filter) ? format_desc.fps * 2.0 : format_desc.fps, frame_factory)\r
        {\r
                frame_buffer_.set_capacity(2);\r
                \r
@@ -285,7 +285,7 @@ public:
        }\r
 };\r
 \r
-safe_ptr<core::frame_producer> create_decklink_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
 {\r
        if(params.empty() || !boost::iequals(params[0], "decklink"))\r
                return core::frame_producer::empty();\r
@@ -305,4 +305,4 @@ safe_ptr<core::frame_producer> create_decklink_producer(const safe_ptr<core::fra
        return make_safe<decklink_producer_proxy>(frame_factory, format_desc, device_index, filter_str, length);\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/decklink/producer/decklink_producer.h b/modules/decklink/producer/decklink_producer.h
index 09b9c99d2918c03ebd9b4e29a2b7fbc347b6fb2f..934e09c6a1631a017e9b51397f31529d6e29d911 100644 (file)
--- a/modules/decklink/producer/decklink_producer.h
+++ b/modules/decklink/producer/decklink_producer.h
@@ -24,8 +24,8 @@
 #include <string>\r
 #include <vector>\r
 \r
-namespace caspar { \r
+namespace caspar { namespace decklink {\r
        \r
-safe_ptr<core::frame_producer> create_decklink_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
 \r
-}\r
+}}\r

diff --git a/modules/decklink/util/util.h b/modules/decklink/util/util.h
index 37006c9d1e5fa0ed7fc78ea5323d802af600ba8b..09bca51967ca77e19e1f19d2e0c71570f3bdc3da 100644 (file)
--- a/modules/decklink/util/util.h
+++ b/modules/decklink/util/util.h
@@ -31,7 +31,7 @@
 \r
 #include <string>\r
 \r
-namespace caspar { \r
+namespace caspar { namespace decklink {\r
        \r
 static BMDDisplayMode get_decklink_video_format(core::video_format::type fmt) \r
 {\r
@@ -152,4 +152,4 @@ static std::wstring get_model_name(const T& device)
        return std::wstring(pModelName);\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index 13089c16c102ea46b7d39b31241609f092e49af3..87e1e00833d8308f08941dcb4e6e5eeddc33b14c 100644 (file)
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -46,7 +46,7 @@ extern "C"
        #include <libavfilter/avfilter.h>\r
 }\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
        \r
 int ffmpeg_lock_callback(void **mutex, enum AVLockOp op) \r
 { \r
@@ -151,7 +151,7 @@ void log_callback(void* ptr, int level, const char* fmt, va_list vl)
     //colored_fputs(av_clip(level>>3, 0, 6), line);\r
 }\r
 \r
-void init_ffmpeg()\r
+void init()\r
 {\r
     avfilter_register_all();\r
        av_register_all();\r
@@ -161,10 +161,10 @@ void init_ffmpeg()
        av_log_set_callback(log_callback);\r
        \r
        //core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_ffmpeg_consumer(params);});\r
-       core::register_producer_factory(create_ffmpeg_producer);\r
+       core::register_producer_factory(create_producer);\r
 }\r
 \r
-void uninit_ffmpeg()\r
+void uninit()\r
 {\r
        avfilter_uninit();\r
        av_lockmgr_register(nullptr);\r
@@ -202,4 +202,4 @@ std::wstring get_swscale_version()
        return make_version(swscale_version());\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/ffmpeg.h b/modules/ffmpeg/ffmpeg.h
index 679182ab36e60550816ce3521753b41c9b8b835d..d496924b5fd1eb0e652f303d3c91f28af9510963 100644 (file)
--- a/modules/ffmpeg/ffmpeg.h
+++ b/modules/ffmpeg/ffmpeg.h
@@ -21,10 +21,10 @@
 \r
 #include <string>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
 \r
-void init_ffmpeg();\r
-void uninit_ffmpeg();\r
+void init();\r
+void uninit();\r
 \r
 std::wstring get_avcodec_version();\r
 std::wstring get_avformat_version();\r
@@ -32,4 +32,4 @@ std::wstring get_avutil_version();
 std::wstring get_avfilter_version();\r
 std::wstring get_swscale_version();\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/ffmpeg_error.h b/modules/ffmpeg/ffmpeg_error.h
index b50efee452d29724529a99c4d652ee4a097c9fc2..017b13c75f5dd10d41ccca413e8d43c6b17f0874 100644 (file)
--- a/modules/ffmpeg/ffmpeg_error.h
+++ b/modules/ffmpeg/ffmpeg_error.h
@@ -13,7 +13,7 @@ extern "C"
 \r
 #pragma warning(pop)\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
 \r
 struct ffmpeg_error : virtual caspar_exception{};\r
 \r
@@ -56,4 +56,4 @@ static std::string av_error_str(int errn)
                return ret;                                                                                                                     \\r
        }();\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.cpp b/modules/ffmpeg/producer/audio/audio_decoder.cpp
index a71c672c25271f23c474f59fb00aecefbc2e535e..3f5fe7f7269e8fa77ea1186d67ea16669c7aded0 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.cpp
+++ b/modules/ffmpeg/producer/audio/audio_decoder.cpp
@@ -44,7 +44,7 @@ extern "C"
 #pragma warning (pop)\r
 #endif\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
        \r
 struct audio_decoder::implementation : boost::noncopyable\r
 {      \r
@@ -166,4 +166,5 @@ void audio_decoder::push(const std::shared_ptr<AVPacket>& packet){impl_->push(pa
 bool audio_decoder::ready() const{return impl_->ready();}\r
 std::vector<std::shared_ptr<core::audio_buffer>> audio_decoder::poll(){return impl_->poll();}\r
 int64_t audio_decoder::nb_frames() const{return impl_->nb_frames_;}\r
-}
\ No newline at end of file
+\r
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.h b/modules/ffmpeg/producer/audio/audio_decoder.h
index e2c978cf8db3854b3b523d57f1988f9504f7759d..e446bd20f882e84e60c3b9fb00f7c9aea342eddf 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.h
+++ b/modules/ffmpeg/producer/audio/audio_decoder.h
@@ -38,6 +38,8 @@ struct video_format_desc;
 \r
 }\r
 \r
+namespace ffmpeg {\r
+\r
 class audio_decoder : boost::noncopyable\r
 {\r
 public:\r
@@ -54,4 +56,4 @@ private:
        safe_ptr<implementation> impl_;\r
 };\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/audio/audio_resampler.cpp b/modules/ffmpeg/producer/audio/audio_resampler.cpp
index baa24774ba1914385e6a97b7a58cb2593ce2a7a9..179d09cc589e92408df493f59270451deb75104a 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_resampler.cpp
+++ b/modules/ffmpeg/producer/audio/audio_resampler.cpp
@@ -16,8 +16,7 @@ extern "C"
 #pragma warning (pop)\r
 #endif\r
 \r
-\r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
 \r
 struct audio_resampler::implementation\r
 {      \r
@@ -83,4 +82,4 @@ audio_resampler::audio_resampler(size_t output_channels, size_t input_channels,
                                : impl_(new implementation(output_channels, input_channels, output_sample_rate, input_sample_rate, output_sample_format, input_sample_format)){}\r
 std::vector<int8_t, tbb::cache_aligned_allocator<int8_t>> audio_resampler::resample(std::vector<int8_t, tbb::cache_aligned_allocator<int8_t>>&& data){return impl_->resample(std::move(data));}\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/audio/audio_resampler.h b/modules/ffmpeg/producer/audio/audio_resampler.h
index bc03bcb22712a5e50140dc02297dee26eb6b21d6..e25d06bf5d99caa1570b6c87fe803e9ac57b51f8 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_resampler.h
+++ b/modules/ffmpeg/producer/audio/audio_resampler.h
@@ -4,7 +4,7 @@
 \r
 #include <libavutil/samplefmt.h>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
 \r
 class audio_resampler\r
 {\r
@@ -19,4 +19,4 @@ private:
        std::shared_ptr<implementation> impl_;\r
 };\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index d1ca8c0295a97d0f420c87ef472398903f3f0778..480e95b8d0d3739eb4db855e35613adc428ca9fc 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -46,7 +46,7 @@
 \r
 #include <tbb/parallel_invoke.h>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
                                \r
 struct ffmpeg_producer : public core::frame_producer\r
 {\r
@@ -221,7 +221,7 @@ public:
        }\r
 };\r
 \r
-safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
 {              \r
        static const std::vector<std::wstring> extensions = boost::assign::list_of\r
                (L"mpg")(L"mpeg")(L"m2v")(L"m4v")(L"mp3")(L"mp4")(L"mpga")\r
@@ -259,4 +259,4 @@ safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame
        return make_safe<ffmpeg_producer>(frame_factory, path, filter_str, loop, start, length);\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.h b/modules/ffmpeg/producer/ffmpeg_producer.h
index 9bbb5ffa2a7d8c4897db077a5f2c30b860fe6597..0158a1092f8edcced4e11397e117a23c94ef835c 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.h
+++ b/modules/ffmpeg/producer/ffmpeg_producer.h
@@ -33,6 +33,8 @@ struct frame_factory;
 \r
 }\r
        \r
-safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
+namespace ffmpeg {\r
 \r
-}
\ No newline at end of file
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
+\r
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/filter/filter.cpp b/modules/ffmpeg/producer/filter/filter.cpp
index 2475bf7101c50a2fef37ead3b18acc50cc4f7ef7..1fcf62bc5a31e702cdaf974877d3ee92c14da94e 100644 (file)
--- a/modules/ffmpeg/producer/filter/filter.cpp
+++ b/modules/ffmpeg/producer/filter/filter.cpp
@@ -29,7 +29,7 @@ extern "C"
 #pragma warning (pop)\r
 #endif\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
        \r
 struct filter::implementation\r
 {\r
@@ -167,4 +167,5 @@ filter::filter(const std::wstring& filters, const std::vector<PixelFormat>& pix_
 filter::filter(filter&& other) : impl_(std::move(other.impl_)){}\r
 filter& filter::operator=(filter&& other){impl_ = std::move(other.impl_); return *this;}\r
 std::vector<safe_ptr<AVFrame>> filter::execute(const std::shared_ptr<AVFrame>& frame) {return impl_->execute(frame);}\r
-}
\ No newline at end of file
+\r
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/filter/filter.h b/modules/ffmpeg/producer/filter/filter.h
index 6fabbd67331333badc123f4d29c0285d5ea3f16b..7b3078518aef29cab2a3cd5945bca2442bcd7254 100644 (file)
--- a/modules/ffmpeg/producer/filter/filter.h
+++ b/modules/ffmpeg/producer/filter/filter.h
@@ -10,7 +10,7 @@
 struct AVFrame;\r
 enum PixelFormat;\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
                \r
 static bool double_rate(const std::wstring& filters)\r
 {\r
@@ -37,4 +37,4 @@ private:
        safe_ptr<implementation> impl_;\r
 };\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/filter/parallel_yadif.cpp b/modules/ffmpeg/producer/filter/parallel_yadif.cpp
index 97b31ef19d626027a0f9bd1c58dbe8bfb352aa27..0f2f04f1a0d202574c8fade9ac0e59d9228c7c6c 100644 (file)
--- a/modules/ffmpeg/producer/filter/parallel_yadif.cpp
+++ b/modules/ffmpeg/producer/filter/parallel_yadif.cpp
@@ -76,7 +76,7 @@ void parallel_yadif_filter_line(parallel_yadif_context& ctx, uint8_t *dst, uint8
        }\r
 }\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
        \r
 tbb::concurrent_bounded_queue<decltype(org_yadif_filter_line)> parallel_line_func_pool;\r
 std::array<parallel_yadif_context, 18> ctxs;\r
@@ -125,8 +125,8 @@ std::shared_ptr<void> make_parallel_yadif(AVFilterContext* ctx)
                        ++index;\r
 \r
                ctxs[index].last_index = 0;\r
-               for (int y = 0; y < ctx->inputs[0]->h; y++)
-               {
+               for (int y = 0; y < ctx->inputs[0]->h; y++)\r
+               {\r
             if ((y ^ yadif->parity) & 1)\r
                                ++ctxs[index].last_index;\r
                }\r
@@ -137,4 +137,4 @@ std::shared_ptr<void> make_parallel_yadif(AVFilterContext* ctx)
        return std::shared_ptr<void>(func, return_parallel_yadif);\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/filter/parallel_yadif.h b/modules/ffmpeg/producer/filter/parallel_yadif.h
index 44a0e87211003c0776090847106e53689e476f35..44fc679f7f3893302a5ee5f92252ea0ca3b04508 100644 (file)
--- a/modules/ffmpeg/producer/filter/parallel_yadif.h
+++ b/modules/ffmpeg/producer/filter/parallel_yadif.h
@@ -4,8 +4,8 @@
 \r
 struct AVFilterContext;\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
        \r
 std::shared_ptr<void> make_parallel_yadif(AVFilterContext* ctx);\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/format/flv.cpp b/modules/ffmpeg/producer/format/flv.cpp
index 2e7b85649a49fdd36255dc38d5349e4ada9a8dc2..37b1977172e9c04366480777b56c89d9f5111afe 100644 (file)
--- a/modules/ffmpeg/producer/format/flv.cpp
+++ b/modules/ffmpeg/producer/format/flv.cpp
@@ -10,7 +10,7 @@
 \r
 #include <unordered_map>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
        \r
 std::map<std::string, std::string> read_flv_meta_info(const std::string& filename)\r
 {\r
@@ -78,4 +78,4 @@ std::map<std::string, std::string> read_flv_meta_info(const std::string& filenam
     return values;\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/format/flv.h b/modules/ffmpeg/producer/format/flv.h
index 931e7fffbef16a082821b3bbf4bd2db066bf4c4e..c104f5b8f36d96dddd072722dfec6e1df9d4e7c7 100644 (file)
--- a/modules/ffmpeg/producer/format/flv.h
+++ b/modules/ffmpeg/producer/format/flv.h
@@ -1,7 +1,7 @@
 #pragma once\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
        \r
 std::map<std::string, std::string> read_flv_meta_info(const std::string& filename);\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/frame_muxer.cpp b/modules/ffmpeg/producer/frame_muxer.cpp
index 4dfbcebf234e71ad09442994fe0902e9e52d1dca..807b86e82adf601ea96bd2678888c2ba5f408cde 100644 (file)
--- a/modules/ffmpeg/producer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/frame_muxer.cpp
@@ -41,7 +41,7 @@ extern "C"
 \r
 using namespace caspar::core;\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
 \r
 struct display_mode\r
 {\r
@@ -419,4 +419,4 @@ bool frame_muxer::video_ready() const{return impl_->video_ready();}
 bool frame_muxer::audio_ready() const{return impl_->audio_ready();}\r
 int64_t frame_muxer::calc_nb_frames(int64_t nb_frames) const {return impl_->calc_nb_frames(nb_frames);}\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/frame_muxer.h b/modules/ffmpeg/producer/frame_muxer.h
index 9390f0b8586683e7a2c916be357278d6209e8116..8aa79834c0ce2f081d1ec9f8289bd440591e8ceb 100644 (file)
--- a/modules/ffmpeg/producer/frame_muxer.h
+++ b/modules/ffmpeg/producer/frame_muxer.h
@@ -20,6 +20,8 @@ struct frame_factory;
 \r
 }\r
 \r
+namespace ffmpeg {\r
+\r
 class frame_muxer : boost::noncopyable\r
 {\r
 public:\r
@@ -44,4 +46,4 @@ private:
        safe_ptr<implementation> impl_;\r
 };\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/input.cpp b/modules/ffmpeg/producer/input.cpp
index 480e7e5d5282057518e78e979879cc32b6f59e05..c8b32cd4a0fc9f8b3d03b6d9ef2827a3ae5706c3 100644 (file)
--- a/modules/ffmpeg/producer/input.cpp
+++ b/modules/ffmpeg/producer/input.cpp
@@ -55,7 +55,7 @@ extern "C"
 #pragma warning (pop)\r
 #endif\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
 \r
 static const size_t MAX_BUFFER_COUNT = 100;\r
 static const size_t MIN_BUFFER_COUNT = 4;\r
@@ -290,4 +290,4 @@ bool input::try_pop(std::shared_ptr<AVPacket>& packet){return impl_->try_pop(pac
 safe_ptr<AVFormatContext> input::context(){return make_safe(impl_->format_context_);}\r
 size_t input::nb_frames() const {return impl_->nb_frames();}\r
 size_t input::nb_loops() const {return impl_->nb_loops();}\r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/input.h b/modules/ffmpeg/producer/input.h
index 66e8e547ea4b00bdeaddd3b8a079d9c1debb9f99..6b391581f519b7ab615aa52478316632676777d4 100644 (file)
--- a/modules/ffmpeg/producer/input.h
+++ b/modules/ffmpeg/producer/input.h
@@ -36,7 +36,9 @@ namespace diagnostics {
 class graph;\r
 \r
 }\r
-       \r
+        \r
+namespace ffmpeg {\r
+\r
 class input : boost::noncopyable\r
 {\r
 public:\r
@@ -55,4 +57,4 @@ private:
 };\r
 \r
        \r
-}\r
+}}\r

diff --git a/modules/ffmpeg/producer/util.cpp b/modules/ffmpeg/producer/util.cpp
index 2a2595680536ea0097dcf1aa7c3a40291f229087..79fae01a8cbb9bcae4b8ed949ff3fe1a8dae64dc 100644 (file)
--- a/modules/ffmpeg/producer/util.cpp
+++ b/modules/ffmpeg/producer/util.cpp
@@ -33,7 +33,7 @@ extern "C"
 #pragma warning (pop)\r
 #endif\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
 \r
 core::field_mode::type get_mode(AVFrame& frame)\r
 {\r
@@ -287,4 +287,4 @@ void fix_meta_data(AVFormatContext& context)
        video_context.time_base.den = static_cast<int>(closest_fps*1000000.0);\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/util.h b/modules/ffmpeg/producer/util.h
index 67560676c4cf9979012eb5d94e14a7396d857f94..7b32ff9f0b1c090c8b1a0f7b7cc41e66239c4dcc 100644 (file)
--- a/modules/ffmpeg/producer/util.h
+++ b/modules/ffmpeg/producer/util.h
@@ -23,6 +23,8 @@ struct frame_factory;
 \r
 }\r
 \r
+namespace ffmpeg {\r
+\r
 static const PixelFormat       CASPAR_PIX_FMT_LUMA = PIX_FMT_MONOBLACK; // Just hijack some unual pixel format.\r
 \r
 core::field_mode::type         get_mode(AVFrame& frame);\r
@@ -33,4 +35,4 @@ safe_ptr<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVF
 \r
 void fix_meta_data(AVFormatContext& context);\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/video/video_decoder.cpp b/modules/ffmpeg/producer/video/video_decoder.cpp
index f365a7c96e724dc511d076d7c65633a27ac1b4db..4e2ba9664fb22d640905e8b52af3b6ac04de1e31 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.cpp
+++ b/modules/ffmpeg/producer/video/video_decoder.cpp
@@ -48,7 +48,7 @@ extern "C"
 #pragma warning (pop)\r
 #endif\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
        \r
 struct video_decoder::implementation : boost::noncopyable\r
 {\r
@@ -215,4 +215,5 @@ double video_decoder::fps() const{return impl_->fps();}
 int64_t video_decoder::nb_frames() const{return impl_->nb_frames_;}\r
 size_t video_decoder::width() const{return impl_->width_;}\r
 size_t video_decoder::height() const{return impl_->height_;}\r
-}
\ No newline at end of file
+\r
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/video/video_decoder.h b/modules/ffmpeg/producer/video/video_decoder.h
index 743bf749ae449323b84bca289a7b24a6dd44f663..1351e881bf0f5ee35fd8b4e2ac078b30d077f4ad 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.h
+++ b/modules/ffmpeg/producer/video/video_decoder.h
@@ -38,6 +38,8 @@ namespace core {
        class write_frame;\r
 }\r
 \r
+namespace ffmpeg {\r
+\r
 class video_decoder : boost::noncopyable\r
 {\r
 public:\r
@@ -58,4 +60,4 @@ private:
        safe_ptr<implementation> impl_;\r
 };\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/tbb_avcodec.cpp b/modules/ffmpeg/tbb_avcodec.cpp
index 27925b5539af24e39dcae4a3aed94e7ef769326b..71d623d607ba57ab93beed1427289070178f0dfc 100644 (file)
--- a/modules/ffmpeg/tbb_avcodec.cpp
+++ b/modules/ffmpeg/tbb_avcodec.cpp
@@ -27,7 +27,7 @@ extern "C"
 #pragma warning (pop)\r
 #endif\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
                \r
 int thread_execute(AVCodecContext* s, int (*func)(AVCodecContext *c2, void *arg2), void* arg, int* ret, int count, int size)\r
 {\r
@@ -111,4 +111,4 @@ int tbb_avcodec_close(AVCodecContext* avctx)
        return avcodec_close(avctx); \r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ffmpeg/tbb_avcodec.h b/modules/ffmpeg/tbb_avcodec.h
index e2aa3e9af0521e2b5e162202a7d123fa2d7467c4..2b2ab3918cbeac306c97a372c04aa7ef8a5a49cb 100644 (file)
--- a/modules/ffmpeg/tbb_avcodec.h
+++ b/modules/ffmpeg/tbb_avcodec.h
@@ -3,9 +3,9 @@
 struct AVCodecContext;\r
 struct AVCodec;\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
        \r
 int tbb_avcodec_open(AVCodecContext *avctx, AVCodec *codec);\r
 int tbb_avcodec_close(AVCodecContext *avctx);\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/flash/flash.cpp b/modules/flash/flash.cpp
index b103e4e61c0913fc0c6a8de8a2b35da60f4151df..9378a073d09a3fa7682baf37064d6db0d2b3c744 100644 (file)
--- a/modules/flash/flash.cpp
+++ b/modules/flash/flash.cpp
@@ -26,9 +26,9 @@
 \r
 #include <common/env.h>\r
 \r
-namespace caspar{\r
+namespace caspar { namespace flash {\r
 \r
-void init_flash()\r
+void init()\r
 {\r
        core::register_producer_factory(create_ct_producer);\r
 }\r
@@ -38,7 +38,7 @@ std::wstring get_cg_version()
        return L"Unknown";\r
 }\r
 \r
-std::wstring get_flash_version()\r
+std::wstring get_version()\r
 {              \r
        std::wstring version = L"Not found";\r
 #ifdef WIN32\r
@@ -61,4 +61,4 @@ std::wstring get_flash_version()
        return version;\r
 }\r
 \r
-}\r
+}}\r

diff --git a/modules/flash/flash.h b/modules/flash/flash.h
index 10f275e178e4ada8b8de4f71a064b83f7cafb8ad..a597f1481d9aa8b483b0c9bfebb5563c24906e93 100644 (file)
--- a/modules/flash/flash.h
+++ b/modules/flash/flash.h
@@ -21,11 +21,11 @@
 \r
 #include <string>\r
 \r
-namespace caspar{\r
+namespace caspar { namespace flash {\r
 \r
-void init_flash();\r
+void init();\r
 \r
 std::wstring get_cg_version();\r
-std::wstring get_flash_version();\r
+std::wstring get_version();\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/flash/producer/cg_producer.cpp b/modules/flash/producer/cg_producer.cpp
index 1cb9c09b6f98d6d22310b85edb995c76c14ef2ca..fb1604d452c9a382ec808f5ee0c8d7b418ade629 100644 (file)
--- a/modules/flash/producer/cg_producer.cpp
+++ b/modules/flash/producer/cg_producer.cpp
@@ -30,7 +30,7 @@
 #include <boost/filesystem.hpp>\r
 #include <boost/format.hpp>\r
                \r
-namespace caspar {\r
+namespace caspar { namespace flash {\r
        \r
 struct cg_producer::implementation : boost::noncopyable\r
 {\r
@@ -115,7 +115,7 @@ safe_ptr<cg_producer> get_default_cg_producer(const safe_ptr<core::video_channel
 \r
        if(flash_producer->print().find(L"flash[") == std::string::npos) // UGLY hack\r
        {\r
-               flash_producer = create_flash_producer(video_channel->mixer(), boost::assign::list_of<std::wstring>()); \r
+               flash_producer = flash::create_producer(video_channel->mixer(), boost::assign::list_of<std::wstring>());        \r
                video_channel->stage()->load(render_layer, flash_producer); \r
                video_channel->stage()->play(render_layer);\r
        }\r
@@ -129,7 +129,7 @@ safe_ptr<core::frame_producer> create_ct_producer(const safe_ptr<core::frame_fac
        if(!boost::filesystem::exists(filename))\r
                return core::frame_producer::empty();\r
        \r
-       auto flash_producer = create_flash_producer(frame_factory, boost::assign::list_of<std::wstring>());     \r
+       auto flash_producer = flash::create_producer(frame_factory, boost::assign::list_of<std::wstring>());    \r
        auto producer = make_safe<cg_producer>(flash_producer);\r
        producer->add(0, filename, 1);\r
 \r
@@ -149,4 +149,4 @@ void cg_producer::update(int layer, const std::wstring& data){impl_->update(laye
 void cg_producer::invoke(int layer, const std::wstring& label){impl_->invoke(layer, label);}\r
 std::wstring cg_producer::print() const{return impl_->print();}\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/flash/producer/cg_producer.h b/modules/flash/producer/cg_producer.h
index 0ca345fdece3683326f74310aecdf1899c2a011e..e631a6475dbc92aff13249c108b0c30254702091 100644 (file)
--- a/modules/flash/producer/cg_producer.h
+++ b/modules/flash/producer/cg_producer.h
@@ -26,7 +26,7 @@
 \r
 #include <string>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace flash {\r
                \r
 class cg_producer : public core::frame_producer\r
 {\r
@@ -58,4 +58,4 @@ safe_ptr<cg_producer> get_default_cg_producer(const safe_ptr<core::video_channel
 \r
 safe_ptr<core::frame_producer> create_ct_producer(const safe_ptr<core::frame_factory> frame_factory, const std::vector<std::wstring>& params);\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index c285ba9fcc876ab55a9843bed79fa7e899958dda..13a0fa3425259423d3783322202b9ffcd482f820 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -49,7 +49,7 @@
 \r
 #include <tbb/spin_mutex.h>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace flash {\r
                \r
 class bitmap\r
 {\r
@@ -404,14 +404,14 @@ public:
        }\r
 };\r
 \r
-safe_ptr<core::frame_producer> create_flash_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
 {\r
        auto template_host = get_template_host(frame_factory->get_video_format_desc());\r
        \r
        return make_safe<flash_producer>(frame_factory, env::template_folder() + L"\\" + widen(template_host.filename), template_host.width, template_host.height);\r
 }\r
 \r
-std::wstring find_flash_template(const std::wstring& template_name)\r
+std::wstring find_template(const std::wstring& template_name)\r
 {\r
        if(boost::filesystem::exists(template_name + L".ft")) \r
                return template_name + L".ft";\r
@@ -422,4 +422,4 @@ std::wstring find_flash_template(const std::wstring& template_name)
        return L"";\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/flash/producer/flash_producer.h b/modules/flash/producer/flash_producer.h
index a5362d2067dd454f2d8a1976436689029d4f9813..85b299cf09903b01a7b454526a273854f8c6bcb2 100644 (file)
--- a/modules/flash/producer/flash_producer.h
+++ b/modules/flash/producer/flash_producer.h
@@ -26,10 +26,10 @@
 #include <vector>\r
 #include <string>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace flash {\r
 \r
-safe_ptr<core::frame_producer> create_flash_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
 \r
-std::wstring find_flash_template(const std::wstring& templateName);\r
+std::wstring find_template(const std::wstring& templateName);\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/image/consumer/image_consumer.cpp b/modules/image/consumer/image_consumer.cpp
index 529fdab42868c2dd92429fc87cfe00d1e76d5220..bee70d1fc2143fef6d05130fa4d027b5876eae48 100644 (file)
--- a/modules/image/consumer/image_consumer.cpp
+++ b/modules/image/consumer/image_consumer.cpp
@@ -38,7 +38,7 @@
 \r
 #include <vector>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace image {\r
        \r
 struct image_consumer : public core::frame_consumer\r
 {\r
@@ -91,7 +91,7 @@ public:
        }\r
 };\r
 \r
-safe_ptr<core::frame_consumer> create_image_consumer(const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params)\r
 {\r
        if(params.size() < 1 || params[0] != L"IMAGE")\r
                return core::frame_consumer::empty();\r
@@ -99,5 +99,4 @@ safe_ptr<core::frame_consumer> create_image_consumer(const std::vector<std::wstr
        return make_safe<image_consumer>();\r
 }\r
 \r
-\r
-}\r
+}}\r

diff --git a/modules/image/consumer/image_consumer.h b/modules/image/consumer/image_consumer.h
index 2c5bf92f295170ccc30a6e7328af0967f6bb8b14..e7ecc751a6a35567833ec0ce4c5dd53c5fcf39e5 100644 (file)
--- a/modules/image/consumer/image_consumer.h
+++ b/modules/image/consumer/image_consumer.h
@@ -33,7 +33,9 @@ namespace caspar {
 namespace core {\r
        struct frame_consumer;\r
 }\r
+\r
+namespace image {\r
        \r
-safe_ptr<core::frame_consumer> create_image_consumer(const std::vector<std::wstring>& params);\r
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params);\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/image/image.cpp b/modules/image/image.cpp
index 4ede95b6d3dd3585ec87bcb47d729e0e6511939a..971a6c4c0884ffb46a4e93ef577c525d79794797 100644 (file)
--- a/modules/image/image.cpp
+++ b/modules/image/image.cpp
@@ -30,18 +30,18 @@
 \r
 #include <FreeImage.h>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace image {\r
 \r
-void init_image()\r
+void init()\r
 {\r
-       core::register_producer_factory(create_image_scroll_producer);\r
-       core::register_producer_factory(create_image_producer);\r
-       core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_image_consumer(params);});\r
+       core::register_producer_factory(create_scroll_producer);\r
+       core::register_producer_factory(create_producer);\r
+       core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_consumer(params);});\r
 }\r
 \r
-std::wstring get_image_version()\r
+std::wstring get_version()\r
 {\r
        return widen(std::string(FreeImage_GetVersion()));\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/image/image.h b/modules/image/image.h
index 6c60c9d7c939dbf66042a69747159ca602977a16..b13422ea507ffef51948596f532a603cc8d711bf 100644 (file)
--- a/modules/image/image.h
+++ b/modules/image/image.h
@@ -21,10 +21,10 @@
 \r
 #include <string>\r
 \r
-namespace caspar{\r
+namespace caspar { namespace image {\r
 \r
-void init_image();\r
+void init();\r
 \r
-std::wstring get_image_version();\r
+std::wstring get_version();\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/image/producer/image_producer.cpp b/modules/image/producer/image_producer.cpp
index 3b0fad69f3353a8063b112b0a9a7592ad5d3ef90..b3084f91954f63eba2dedcffc0a21a640c493389 100644 (file)
--- a/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@ -36,7 +36,7 @@
 \r
 using namespace boost::assign;\r
 \r
-namespace caspar {\r
+namespace caspar { namespace image {\r
 \r
 struct image_producer : public core::frame_producer\r
 {      \r
@@ -70,7 +70,7 @@ struct image_producer : public core::frame_producer
        }\r
 };\r
 \r
-safe_ptr<core::frame_producer> create_image_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
 {\r
        static const std::vector<std::wstring> extensions = list_of(L"png")(L"tga")(L"bmp")(L"jpg")(L"jpeg")(L"gif")(L"tiff")(L"tif")(L"jp2")(L"jpx")(L"j2k")(L"j2c");\r
        std::wstring filename = env::media_folder() + L"\\" + params[0];\r
@@ -87,4 +87,4 @@ safe_ptr<core::frame_producer> create_image_producer(const safe_ptr<core::frame_
 }\r
 \r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/image/producer/image_producer.h b/modules/image/producer/image_producer.h
index 49b51e01c87ced072828a2f6d14c8a809ef73ea2..6c8772a92b472e95ad7a82ee8c48b4832ea752a6 100644 (file)
--- a/modules/image/producer/image_producer.h
+++ b/modules/image/producer/image_producer.h
@@ -24,8 +24,8 @@
 #include <string>\r
 #include <vector>\r
 \r
-namespace caspar { \r
+namespace caspar { namespace image {\r
 \r
-safe_ptr<core::frame_producer> create_image_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/image/producer/image_scroll_producer.cpp b/modules/image/producer/image_scroll_producer.cpp
index 6e888e59fbee8769761c63b296eea2137bb2b406..4a7b8d195a0b38ebf3c729d1bfdc89820e7eb58b 100644 (file)
--- a/modules/image/producer/image_scroll_producer.cpp
+++ b/modules/image/producer/image_scroll_producer.cpp
@@ -45,7 +45,7 @@
 \r
 using namespace boost::assign;\r
 \r
-namespace caspar {\r
+namespace caspar { namespace image {\r
                \r
 struct image_scroll_producer : public core::frame_producer\r
 {      \r
@@ -211,7 +211,7 @@ struct image_scroll_producer : public core::frame_producer
        }\r
 };\r
 \r
-safe_ptr<core::frame_producer> create_image_scroll_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_scroll_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
 {\r
        static const std::vector<std::wstring> extensions = list_of(L"png")(L"tga")(L"bmp")(L"jpg")(L"jpeg")(L"gif")(L"tiff")(L"tif")(L"jp2")(L"jpx")(L"j2k")(L"j2c");\r
        std::wstring filename = env::media_folder() + L"\\" + params[0];\r
@@ -238,5 +238,4 @@ safe_ptr<core::frame_producer> create_image_scroll_producer(const safe_ptr<core:
        return make_safe<image_scroll_producer>(frame_factory, filename + L"." + *ext, speed);\r
 }\r
 \r
-\r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/image/producer/image_scroll_producer.h b/modules/image/producer/image_scroll_producer.h
index 11c101460ea6da4f4b7274257984970922959070..90ca2e183677b75e9d3cc5d37d984343259a303d 100644 (file)
--- a/modules/image/producer/image_scroll_producer.h
+++ b/modules/image/producer/image_scroll_producer.h
@@ -24,8 +24,8 @@
 #include <string>\r
 #include <vector>\r
 \r
-namespace caspar { \r
+namespace caspar { namespace image {\r
 \r
-safe_ptr<core::frame_producer> create_image_scroll_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
+safe_ptr<core::frame_producer> create_scroll_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/image/util/image_loader.cpp b/modules/image/util/image_loader.cpp
index a4b51962f11739a8bde8b594a3de6942b64bcdf1..ae4d461bfad5da698e23d379bc9d74b47251ce3b 100644 (file)
--- a/modules/image/util/image_loader.cpp
+++ b/modules/image/util/image_loader.cpp
@@ -29,7 +29,7 @@
 #include <boost/exception/errinfo_file_name.hpp>\r
 #include <boost/filesystem.hpp>\r
 \r
-namespace caspar { \r
+namespace caspar { namespace image {\r
 \r
 std::shared_ptr<FIBITMAP> load_image(const std::string& filename)\r
 {\r
@@ -61,4 +61,4 @@ std::shared_ptr<FIBITMAP> load_image(const std::wstring& filename)
        return load_image(narrow(filename));\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/image/util/image_loader.h b/modules/image/util/image_loader.h
index c6cdaa9d114ae8112b79b2457565bd6babe50b92..b13b31e97f76f7ad810c1904dbd88b25f21b8fd0 100644 (file)
--- a/modules/image/util/image_loader.h
+++ b/modules/image/util/image_loader.h
@@ -24,9 +24,9 @@
 #include <memory>\r
 #include <string>\r
 \r
-namespace caspar { \r
+namespace caspar { namespace image {\r
 \r
 std::shared_ptr<FIBITMAP> load_image(const std::string& filename);\r
 std::shared_ptr<FIBITMAP> load_image(const std::wstring& filename);\r
 \r
-}\r
+}}\r

diff --git a/modules/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp
index cd0130a5fedac3dbdd001b8eb5d809f58ad8e90b..35ef456d06f10f3eba6a2373e05c5733c8d31bfe 100644 (file)
--- a/modules/oal/consumer/oal_consumer.cpp
+++ b/modules/oal/consumer/oal_consumer.cpp
@@ -39,7 +39,7 @@
 \r
 #include <tbb/concurrent_queue.h>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace oal {\r
 \r
 struct oal_consumer : public core::frame_consumer,  public sf::SoundStream\r
 {\r
@@ -123,7 +123,7 @@ public:
        }\r
 };\r
 \r
-safe_ptr<core::frame_consumer> create_oal_consumer(const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params)\r
 {\r
        if(params.size() < 1 || params[0] != L"AUDIO")\r
                return core::frame_consumer::empty();\r
@@ -131,9 +131,9 @@ safe_ptr<core::frame_consumer> create_oal_consumer(const std::vector<std::wstrin
        return make_safe<oal_consumer>();\r
 }\r
 \r
-safe_ptr<core::frame_consumer> create_oal_consumer()\r
+safe_ptr<core::frame_consumer> create_consumer()\r
 {\r
        return make_safe<oal_consumer>();\r
 }\r
 \r
-}\r
+}}\r

diff --git a/modules/oal/consumer/oal_consumer.h b/modules/oal/consumer/oal_consumer.h
index 64e87eb0f85d921b51aef1da169266916fe0b4c1..0f3a8a9fb0ed1a386a3c56eaa42918d5afe3e12f 100644 (file)
--- a/modules/oal/consumer/oal_consumer.h
+++ b/modules/oal/consumer/oal_consumer.h
@@ -25,13 +25,15 @@
 \r
 #include <vector>\r
 \r
-namespace caspar {\r
+namespace caspar { \r
 \r
 namespace core {\r
        struct frame_consumer;\r
 }      \r
 \r
-safe_ptr<core::frame_consumer> create_oal_consumer(const std::vector<std::wstring>& params);\r
-safe_ptr<core::frame_consumer> create_oal_consumer();\r
+namespace oal {\r
+       \r
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params);\r
+safe_ptr<core::frame_consumer> create_consumer();\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/oal/oal.cpp b/modules/oal/oal.cpp
index 8c27fd2510f2be6d6cbb3d5483507555fbabeff6..d574361ebe8750546d0b84e59544112932c7e1db 100644 (file)
--- a/modules/oal/oal.cpp
+++ b/modules/oal/oal.cpp
@@ -23,12 +23,11 @@
 \r
 #include <core/consumer/frame_consumer.h>\r
 \r
-namespace caspar\r
-{\r
+namespace caspar { namespace oal {\r
 \r
-void init_oal()\r
+void init()\r
 {\r
-       core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_oal_consumer(params);});\r
+       core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_consumer(params);});\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/oal/oal.h b/modules/oal/oal.h
index d5cc43b83e024fee4a695fe7bafe45394aa351a4..d7c2d26957d9f6a6f43302cda9bac9102560c56d 100644 (file)
--- a/modules/oal/oal.h
+++ b/modules/oal/oal.h
@@ -19,8 +19,8 @@
 */\r
 #pragma once\r
 \r
-namespace caspar{\r
+namespace caspar { namespace oal {\r
 \r
-void init_oal();\r
+void init();\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ogl/consumer/ogl_consumer.cpp b/modules/ogl/consumer/ogl_consumer.cpp
index 11c90d435590449c8720cc6d971784c1d9111020..9550a5a1e81f99e783f7f444ee066021b83a3a7c 100644 (file)
--- a/modules/ogl/consumer/ogl_consumer.cpp
+++ b/modules/ogl/consumer/ogl_consumer.cpp
@@ -66,7 +66,7 @@ extern "C"
 #pragma warning (pop)\r
 #endif\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ogl {\r
                \r
 enum stretch\r
 {\r
@@ -81,15 +81,15 @@ struct configuration
        size_t          screen_index;\r
        stretch         stretch;\r
        bool            windowed;\r
-       bool            key_only;\r
        bool            auto_deinterlace;\r
+       bool            key_only;\r
 \r
        configuration()\r
                : screen_index(0)\r
                , stretch(fill)\r
                , windowed(true)\r
-               , key_only(false)\r
                , auto_deinterlace(true)\r
+               , key_only(false)\r
        {\r
        }\r
 };\r
@@ -123,7 +123,7 @@ struct ogl_consumer : boost::noncopyable
        tbb::atomic<bool>               is_running_;\r
 \r
        \r
-       filter                                  filter_;\r
+       ffmpeg::filter                  filter_;\r
 public:\r
        ogl_consumer(const configuration& config, const core::video_format_desc& format_desc) \r
                : config_(config)\r
@@ -463,7 +463,7 @@ public:
        }\r
 };     \r
 \r
-safe_ptr<core::frame_consumer> create_ogl_consumer(const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params)\r
 {\r
        if(params.size() < 1 || params[0] != L"SCREEN")\r
                return core::frame_consumer::empty();\r
@@ -481,7 +481,7 @@ safe_ptr<core::frame_consumer> create_ogl_consumer(const std::vector<std::wstrin
        return make_safe<ogl_consumer_proxy>(config);\r
 }\r
 \r
-safe_ptr<core::frame_consumer> create_ogl_consumer(const boost::property_tree::ptree& ptree) \r
+safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::ptree& ptree) \r
 {\r
        configuration config;\r
        config.screen_index             = ptree.get("device",   config.screen_index);\r
@@ -498,4 +498,4 @@ safe_ptr<core::frame_consumer> create_ogl_consumer(const boost::property_tree::p
        return make_safe<ogl_consumer_proxy>(config);\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ogl/consumer/ogl_consumer.h b/modules/ogl/consumer/ogl_consumer.h
index 382aae89caf0a74273837524b1b7fdf74f99537a..e2d391eec9ef293b6cb29e367d0626a347bcf4b4 100644 (file)
--- a/modules/ogl/consumer/ogl_consumer.h
+++ b/modules/ogl/consumer/ogl_consumer.h
@@ -24,13 +24,16 @@
 #include <vector>\r
 #include <boost/property_tree/ptree.hpp>\r
 \r
-namespace caspar {\r
-\r
+namespace caspar { \r
+       \r
 namespace core {\r
        struct frame_consumer;\r
 }\r
 \r
-safe_ptr<core::frame_consumer> create_ogl_consumer(const std::vector<std::wstring>& params);\r
-safe_ptr<core::frame_consumer> create_ogl_consumer(const boost::property_tree::ptree& ptree);\r
+namespace ogl {\r
+\r
+\r
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params);\r
+safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::ptree& ptree);\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ogl/ogl.cpp b/modules/ogl/ogl.cpp
index b387512e7b8dc86a60f39e869683f895eefdecb2..08e9f3ede63059141d910a70d0d2c8cafc467011 100644 (file)
--- a/modules/ogl/ogl.cpp
+++ b/modules/ogl/ogl.cpp
@@ -23,12 +23,11 @@
 \r
 #include <core/consumer/frame_consumer.h>\r
 \r
-namespace caspar\r
-{\r
+namespace caspar { namespace ogl {\r
 \r
-void init_ogl()\r
+void init()\r
 {\r
-       core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_ogl_consumer(params);});\r
+       caspar::core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_consumer(params);});\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/modules/ogl/ogl.h b/modules/ogl/ogl.h
index fe1eb2be3769668df850f342664b92603fe66dfa..ddaf4cfc4f58c6727f80b5edf68d32ab8580083c 100644 (file)
--- a/modules/ogl/ogl.h
+++ b/modules/ogl/ogl.h
@@ -19,8 +19,8 @@
 */\r
 #pragma once\r
 \r
-namespace caspar{\r
+namespace caspar { namespace ogl {\r
 \r
-void init_ogl();\r
+void init();\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index a5e1d837743262216a9149f23690febb9b7df0bf..0af1ed8916846298fe34b11aa827d50cdad8bc00 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -590,7 +590,7 @@ bool LoadCommand::DoExecute()
 //             std::wstring filename = templatename;\r
 //             filename.append(extension);\r
 //\r
-//             flash::get_default_cg_producer(info.video_channel, std::max<int>(DEFAULT_CHANNEL_LAYER+1, info.layer_index))\r
+//             flash::flash::get_default_cg_producer(info.video_channel, std::max<int>(DEFAULT_CHANNEL_LAYER+1, info.layer_index))\r
 //                     ->add(flash_layer_index, filename, play_on_load, start_label, data);\r
 //\r
 //             CASPAR_LOG(info) << L"Executed [amcp_channel_cg_add]";\r
@@ -908,14 +908,14 @@ bool CGCommand::DoExecuteAdd() {
                }\r
        }\r
 \r
-       std::wstring fullFilename = find_flash_template(env::template_folder() + _parameters[2]);\r
+       std::wstring fullFilename = flash::find_template(env::template_folder() + _parameters[2]);\r
        if(!fullFilename.empty())\r
        {\r
                std::wstring extension = boost::filesystem::wpath(fullFilename).extension();\r
                std::wstring filename = _parameters[2];\r
                filename.append(extension);\r
 \r
-               get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->add(layer, filename, bDoStart, label, (pDataString!=0) ? pDataString : TEXT(""));\r
+               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->add(layer, filename, bDoStart, label, (pDataString!=0) ? pDataString : TEXT(""));\r
                SetReplyString(TEXT("202 CG OK\r\n"));\r
        }\r
        else\r
@@ -936,7 +936,7 @@ bool CGCommand::DoExecutePlay()
                        return false;\r
                }\r
                int layer = _ttoi(_parameters[1].c_str());\r
-               get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->play(layer);\r
+               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->play(layer);\r
        }\r
        else\r
        {\r
@@ -958,7 +958,7 @@ bool CGCommand::DoExecuteStop()
                        return false;\r
                }\r
                int layer = _ttoi(_parameters[1].c_str());\r
-               get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->stop(layer, 0);\r
+               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->stop(layer, 0);\r
        }\r
        else \r
        {\r
@@ -981,7 +981,7 @@ bool CGCommand::DoExecuteNext()
                }\r
 \r
                int layer = _ttoi(_parameters[1].c_str());\r
-               get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->next(layer);\r
+               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->next(layer);\r
        }\r
        else \r
        {\r
@@ -1004,7 +1004,7 @@ bool CGCommand::DoExecuteRemove()
                }\r
 \r
                int layer = _ttoi(_parameters[1].c_str());\r
-               get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->remove(layer);\r
+               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->remove(layer);\r
        }\r
        else \r
        {\r
@@ -1018,7 +1018,7 @@ bool CGCommand::DoExecuteRemove()
 \r
 bool CGCommand::DoExecuteClear() \r
 {\r
-       GetChannel()->stage()->clear(GetLayerIndex(cg_producer::DEFAULT_LAYER));\r
+       GetChannel()->stage()->clear(GetLayerIndex(flash::cg_producer::DEFAULT_LAYER));\r
        SetReplyString(TEXT("202 CG OK\r\n"));\r
        return true;\r
 }\r
@@ -1056,7 +1056,7 @@ bool CGCommand::DoExecuteUpdate()
                }               \r
 \r
                int layer = _ttoi(_parameters.at(1).c_str());\r
-               get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->update(layer, dataString);\r
+               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->update(layer, dataString);\r
        }\r
        catch(...)\r
        {\r
@@ -1078,7 +1078,7 @@ bool CGCommand::DoExecuteInvoke()
                        return false;\r
                }\r
                int layer = _ttoi(_parameters[1].c_str());\r
-               get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]);\r
+               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]);\r
        }\r
        else \r
        {\r
@@ -1093,7 +1093,7 @@ bool CGCommand::DoExecuteInvoke()
 bool CGCommand::DoExecuteInfo() \r
 {\r
        // TODO\r
-       //get_default_cg_producer(GetChannel())->Info();\r
+       //flash::get_default_cg_producer(GetChannel())->Info();\r
        SetReplyString(TEXT("600 CG FAILED\r\n"));\r
        return true;\r
 }\r
@@ -1307,9 +1307,9 @@ bool VersionCommand::DoExecute()
        if(_parameters.size() > 0)\r
        {\r
                if(_parameters[0] == L"FLASH")\r
-                       replyString = TEXT("201 VERSION OK\r\n FLASH: ") + get_flash_version() + TEXT("\r\n");\r
+                       replyString = TEXT("201 VERSION OK\r\n FLASH: ") + flash::get_version() + TEXT("\r\n");\r
                else if(_parameters[0] == L"TEMPLATEHOST")\r
-                       replyString = TEXT("201 VERSION OK\r\n TEMPLATEHOST: ") + get_cg_version() + TEXT("\r\n");\r
+                       replyString = TEXT("201 VERSION OK\r\n TEMPLATEHOST: ") + flash::get_cg_version() + TEXT("\r\n");\r
                else if(_parameters[0] != L"SERVER")\r
                        replyString = TEXT("403 VERSION ERROR\r\n");\r
        }\r

diff --git a/protocol/cii/CIICommandsImpl.cpp b/protocol/cii/CIICommandsImpl.cpp
index acdb1115b4d659d33e5f88a0403156590e9609bd..7e1957fbaa9546782562e55ce8e549bc670b195a 100644 (file)
--- a/protocol/cii/CIICommandsImpl.cpp
+++ b/protocol/cii/CIICommandsImpl.cpp
@@ -141,7 +141,7 @@ void MiscellaneousCommand::Execute()
 \r
        //TODO: Need to be checked for validity\r
        else if(state_ == 1)\r
-               get_default_cg_producer(pCIIStrategy_->GetChannel())->add(layer_, filename_, false, TEXT(""), xmlData_);\r
+               flash::get_default_cg_producer(pCIIStrategy_->GetChannel())->add(layer_, filename_, false, TEXT(""), xmlData_);\r
 }\r
 \r
 \r
@@ -155,11 +155,11 @@ void KeydataCommand::Execute()
 \r
        //TODO: Need to be checked for validity\r
        else if(state_ == 1)\r
-               get_default_cg_producer(pCIIStrategy_->GetChannel())->stop(layer_, 0);\r
+               flash::get_default_cg_producer(pCIIStrategy_->GetChannel())->stop(layer_, 0);\r
        else if(state_ == 2)\r
-               pCIIStrategy_->GetChannel()->stage()->clear(cg_producer::DEFAULT_LAYER);\r
+               pCIIStrategy_->GetChannel()->stage()->clear(flash::cg_producer::DEFAULT_LAYER);\r
        else if(state_ == 3)\r
-               get_default_cg_producer(pCIIStrategy_->GetChannel())->play(layer_);\r
+               flash::get_default_cg_producer(pCIIStrategy_->GetChannel())->play(layer_);\r
 }\r
 \r
 void KeydataCommand::Setup(const std::vector<std::wstring>& parameters) {\r

diff --git a/protocol/cii/CIIProtocolStrategy.cpp b/protocol/cii/CIIProtocolStrategy.cpp
index 1bf718356a48cbd6af430891f323784a4d1126e0..f0768555350b3daeb3732ef28007192354ad371e 100644 (file)
--- a/protocol/cii/CIIProtocolStrategy.cpp
+++ b/protocol/cii/CIIProtocolStrategy.cpp
@@ -173,14 +173,14 @@ void CIIProtocolStrategy::WriteTemplateData(const std::wstring& templateName, co
                fullTemplateFilename += TEXT("\\");\r
        }\r
        fullTemplateFilename += templateName;\r
-       fullTemplateFilename = find_flash_template(fullTemplateFilename);\r
+       fullTemplateFilename = flash::find_template(fullTemplateFilename);\r
        if(fullTemplateFilename.empty())\r
        {\r
                CASPAR_LOG(error) << "Failed to save instance of " << templateName << TEXT(" as ") << titleName << TEXT(", template ") << fullTemplateFilename << " not found";\r
                return;\r
        }\r
        \r
-       auto producer = create_flash_producer(this->GetChannel()->mixer(), boost::assign::list_of(env::template_folder()+TEXT("CG.fth")));\r
+       auto producer = flash::create_producer(this->GetChannel()->mixer(), boost::assign::list_of(env::template_folder()+TEXT("CG.fth")));\r
 \r
        std::wstringstream flashParam;\r
        flashParam << TEXT("<invoke name=\"Add\" returntype=\"xml\"><arguments><number>1</number><string>") << currentProfile_ << '/' <<  templateName << TEXT("</string><number>0</number><true/><string> </string><string><![CDATA[ ") << xmlData << TEXT(" ]]></string></arguments></invoke>");\r

diff --git a/protocol/clk/CLKProtocolStrategy.cpp b/protocol/clk/CLKProtocolStrategy.cpp
index e7c2f622844ba4ebd5a8a2a4d71b0c052f5455f0..5d25b86bd290a76e0b1cd35c4e08854dd2379329 100644 (file)
--- a/protocol/clk/CLKProtocolStrategy.cpp
+++ b/protocol/clk/CLKProtocolStrategy.cpp
@@ -115,7 +115,7 @@ void CLKProtocolStrategy::Parse(const TCHAR* pData, int charCount, IO::ClientInf
 \r
                        if(currentCommand_.command_ == CLKCommand::CLKReset) \r
                        {\r
-                               pChannel_->stage()->clear(cg_producer::DEFAULT_LAYER);\r
+                               pChannel_->stage()->clear(flash::cg_producer::DEFAULT_LAYER);\r
                                bClockLoaded_ = false;\r
                                \r
                                CASPAR_LOG(info) << L"CLK: Recieved and executed reset-command";\r
@@ -124,11 +124,11 @@ void CLKProtocolStrategy::Parse(const TCHAR* pData, int charCount, IO::ClientInf
                        {\r
                                if(!bClockLoaded_) \r
                                {\r
-                                       get_default_cg_producer(pChannel_)->add(0, TEXT("hawrysklocka/clock.ft"), true, TEXT(""), currentCommand_.GetData());\r
+                                       flash::get_default_cg_producer(pChannel_)->add(0, TEXT("hawrysklocka/clock.ft"), true, TEXT(""), currentCommand_.GetData());\r
                                        bClockLoaded_ = true;\r
                                }\r
                                else \r
-                                       get_default_cg_producer(pChannel_)->update(0, currentCommand_.GetData());\r
+                                       flash::get_default_cg_producer(pChannel_)->update(0, currentCommand_.GetData());\r
                                \r
                                CASPAR_LOG(debug) << L"CLK: Clockdata sent: " << currentCommand_.GetData();\r
                                CASPAR_LOG(debug) << L"CLK: Executed valid command: " << currentCommandString_.str();\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 6c39b8f1e3ef4efc74d978c910e6169281ac197f..ff5f37edd94b659d68b5c684cc92f88258b590a3 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -39,6 +39,7 @@
             <device>1</device>\r
             <embedded-audio>true</embedded-audio>\r
           </decklink>\r
+          <screen></screen>\r
         </consumers>\r
       </channel>\r
     </channels>\r

diff --git a/shell/main.cpp b/shell/main.cpp
index dec2f600c212989010504ca30ac4253d2e3f282f..97c9760b1420fa0ff102db8a7a8f8eb31bd00f42 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -122,28 +122,28 @@ void print_info()
        CASPAR_LOG(info) << L"on " << caspar::get_win_product_name() << L" " << caspar::get_win_sp_version();\r
        CASPAR_LOG(info) << caspar::get_cpu_info();\r
        CASPAR_LOG(info) << caspar::get_system_product_name();\r
-       CASPAR_LOG(info) << L"Flash " << caspar::get_flash_version();\r
-       CASPAR_LOG(info) << L"Flash-Template-Host " << caspar::get_cg_version();\r
-       CASPAR_LOG(info) << L"FreeImage " << caspar::get_image_version();\r
+       CASPAR_LOG(info) << L"Flash " << caspar::flash::get_version();\r
+       CASPAR_LOG(info) << L"Flash-Template-Host " << caspar::flash::get_cg_version();\r
+       CASPAR_LOG(info) << L"FreeImage " << caspar::image::get_version();\r
        \r
-       CASPAR_LOG(info) << L"Decklink " << caspar::get_decklink_version();\r
-       auto deck = caspar::get_decklink_device_list();\r
+       CASPAR_LOG(info) << L"Decklink " << caspar::decklink::get_version();\r
+       auto deck = caspar::decklink::get_device_list();\r
        std::for_each(deck.begin(), deck.end(), [](const std::wstring& device)\r
        {\r
                CASPAR_LOG(info) << device;\r
        });\r
                \r
-       auto blue = caspar::get_bluefish_device_list();\r
+       auto blue = caspar::bluefish::get_device_list();\r
        std::for_each(blue.begin(), blue.end(), [](const std::wstring& device)\r
        {\r
                CASPAR_LOG(info) << device;\r
        });\r
        \r
-       CASPAR_LOG(info) << L"FFMPEG-avcodec "  << caspar::get_avcodec_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-avformat " << caspar::get_avformat_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-avfilter " << caspar::get_avfilter_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-avutil " << caspar::get_avutil_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-swscale "  << caspar::get_swscale_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-avcodec "  << caspar::ffmpeg::get_avcodec_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-avformat " << caspar::ffmpeg::get_avformat_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-avfilter " << caspar::ffmpeg::get_avfilter_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-avutil "   << caspar::ffmpeg::get_avutil_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-swscale "  << caspar::ffmpeg::get_swscale_version();\r
        CASPAR_LOG(info) << L"OpenGL " << caspar::core::ogl_device::get_version() << "\n\n";\r
 }\r
 \r

diff --git a/shell/server.cpp b/shell/server.cpp
index b121b809819c43776d951fd00d19f20f75717842..5d9bf906f80ffbf8e496804fa7c1b7a1b1030ff7 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -68,14 +68,14 @@ struct server::implementation : boost::noncopyable
 \r
        implementation()                                                                                                \r
        {                       \r
-               init_ffmpeg();\r
-               init_bluefish();\r
-               init_decklink();\r
-               init_flash();\r
-               init_oal();\r
-               init_ogl();\r
+               ffmpeg::init();\r
+               bluefish::init();\r
+               decklink::init();\r
+               flash::init();\r
+               oal::init();\r
+               ogl::init();\r
                //init_silverlight();\r
-               init_image();\r
+               image::init();\r
 \r
                setup_channels(env::properties());\r
                setup_controllers(env::properties());\r
@@ -83,7 +83,7 @@ struct server::implementation : boost::noncopyable
 \r
        ~implementation()\r
        {               \r
-               uninit_ffmpeg();\r
+               ffmpeg::uninit();\r
 \r
                async_servers_.clear();\r
                channels_.clear();\r
@@ -107,15 +107,15 @@ struct server::implementation : boost::noncopyable
                                {\r
                                        const std::string name = xml_consumer.first;\r
                                        if(name == "screen")\r
-                                               channels_.back()->output()->add(index++, create_ogl_consumer(xml_consumer.second));                                     \r
+                                               channels_.back()->output()->add(index++, ogl::create_consumer(xml_consumer.second));                                    \r
                                        else if(name == "bluefish")                                     \r
-                                               channels_.back()->output()->add(index++, create_bluefish_consumer(xml_consumer.second));                                        \r
+                                               channels_.back()->output()->add(index++, bluefish::create_consumer(xml_consumer.second));                                       \r
                                        else if(name == "decklink")                                     \r
-                                               channels_.back()->output()->add(index++, create_decklink_consumer(xml_consumer.second));                                \r
+                                               channels_.back()->output()->add(index++, decklink::create_consumer(xml_consumer.second));                               \r
                                        //else if(name == "file")                                       \r
                                        //      channels_.back()->output()->add(index++, create_ffmpeg_consumer(xml_consumer.second));                                          \r
                                        else if(name == "audio")\r
-                                               channels_.back()->output()->add(index++, create_oal_consumer());                \r
+                                               channels_.back()->output()->add(index++, oal::create_consumer());               \r
                                        else if(name != "<xmlcomment>")\r
                                                CASPAR_LOG(warning) << "Invalid consumer: " << widen(name);     \r
                                }\r