2.0.0.2: Some header include refactorings.

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

diff --git a/core/channel.cpp b/core/channel.cpp
index 7f587bc56ffe65778109d1d2d135fab735d985c5..c65fd69bd8ce326c293a0eff71c05c0e8b62962e 100644 (file)
--- a/core/channel.cpp
+++ b/core/channel.cpp
@@ -22,6 +22,7 @@
 \r
 #include "channel.h"\r
 \r
+#include "video_format.h"\r
 #include "consumer/frame_consumer_device.h"\r
 #include "mixer/frame_mixer_device.h"\r
 #include "producer/frame_producer_device.h"\r

diff --git a/core/mixer/frame_mixer_device.cpp b/core/mixer/frame_mixer_device.cpp
index b1f69eeb0fab9592cb446d5060df329f48293c39..fc88c838653e8d82232266e12357a65c7ba9ccdd 100644 (file)
--- a/core/mixer/frame_mixer_device.cpp
+++ b/core/mixer/frame_mixer_device.cpp
@@ -30,10 +30,12 @@
 #include <common/exception/exceptions.h>\r
 #include <common/concurrency/executor.h>\r
 #include <common/diagnostics/graph.h>\r
-#include <common/utility/assert.h>\r
-#include <common/utility/timer.h>\r
 #include <common/utility/tweener.h>\r
 \r
+#include <core/consumer/frame/read_frame.h>\r
+#include <core/producer/frame/write_frame.h>\r
+#include <core/producer/frame/frame_factory.h>\r
+#include <core/producer/frame/pixel_format.h>\r
 #include <core/producer/frame/audio_transform.h>\r
 #include <core/producer/frame/image_transform.h>\r
 \r

diff --git a/core/mixer/frame_mixer_device.h b/core/mixer/frame_mixer_device.h
index d72c42bbe71b99050c522e263091217c5a317106..63c4bdbce359a9707a9f4c14aa523dfc813f2f53 100644 (file)
--- a/core/mixer/frame_mixer_device.h
+++ b/core/mixer/frame_mixer_device.h
@@ -19,13 +19,8 @@
 */\r
 #pragma once\r
 \r
-#include <core/consumer/frame/read_frame.h>\r
-#include <core/producer/frame/write_frame.h>\r
-#include <core/producer/frame/frame_factory.h>\r
-#include <core/producer/frame/pixel_format.h>\r
-\r
-#include "image/image_mixer.h"\r
-#include "audio/audio_mixer.h"\r
+#include "../producer/frame/pixel_format.h"\r
+#include "../producer/frame/frame_factory.h"\r
 \r
 #include <common/memory/safe_ptr.h>\r
 \r
@@ -33,7 +28,19 @@
 \r
 #include <functional>\r
 \r
-namespace caspar { namespace mixer {\r
+namespace caspar { \r
+\r
+namespace core {\r
+\r
+class read_frame;\r
+class write_frame;\r
+class basic_frame;\r
+class audio_transform;\r
+class image_transform;\r
+\r
+}\r
+\r
+namespace mixer {\r
        \r
 class frame_mixer_device : public core::frame_factory\r
 {\r

diff --git a/core/producer/color/color_producer.cpp b/core/producer/color/color_producer.cpp
index 067662a2b69a6dcf84d9e9fad30601b4595bac81..1122a095e718842340600c81b29972aba2bcff9e 100644 (file)
--- a/core/producer/color/color_producer.cpp
+++ b/core/producer/color/color_producer.cpp
@@ -21,7 +21,8 @@
 \r
 #include "color_producer.h"\r
 \r
-#include <core/producer/frame/write_frame.h>\r
+#include "../frame/basic_frame.h"\r
+#include "../frame/write_frame.h"\r
 \r
 #include <sstream>\r
 \r

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 6fe7cd58f5cbb108fe75df063883e7b5d0523ea8..d1ffab291489ec2d657d52cd260eca0aae5069c1 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -21,6 +21,8 @@
 #include "../StdAfx.h"\r
 \r
 #include "frame_producer.h"\r
+#include "frame/basic_frame.h"\r
+\r
 #include "color/color_producer.h"\r
 #include "separated/separated_producer.h"\r
 \r
@@ -30,6 +32,18 @@ namespace caspar { namespace core {
        \r
 std::vector<const producer_factory_t> g_factories;\r
 \r
+const safe_ptr<frame_producer>& frame_producer::empty() // nothrow\r
+{\r
+       struct empty_frame_producer : public frame_producer\r
+       {\r
+               virtual safe_ptr<basic_frame> receive(){return basic_frame::empty();}\r
+               virtual void set_frame_factory(const safe_ptr<frame_factory>&){}\r
+               virtual std::wstring print() const { return L"empty";}\r
+       };\r
+       static safe_ptr<frame_producer> producer = make_safe<empty_frame_producer>();\r
+       return producer;\r
+}      \r
+\r
 safe_ptr<basic_frame> receive_and_follow(safe_ptr<frame_producer>& producer)\r
 {      \r
        if(producer == frame_producer::empty())\r

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index 705ce64110f7fbfbba32761f53b4b23676028bf0..b9cecef9b691777b3686c81fa383ae0a6a225a27 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -21,16 +21,18 @@
 \r
 #include <common/memory/safe_ptr.h>\r
 \r
-#include "../producer/frame/basic_frame.h"\r
-#include "../producer/frame/frame_factory.h"\r
+#include "frame/frame_factory.h"\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
 #include <functional>\r
 #include <string>\r
+#include <vector>\r
 \r
 namespace caspar { namespace core {\r
 \r
+class basic_frame;\r
+\r
 class frame_producer : boost::noncopyable\r
 {\r
 public:\r
@@ -44,17 +46,7 @@ public:
        virtual safe_ptr<frame_producer> get_following_producer() const {return frame_producer::empty();}  // nothrow\r
        virtual void set_leading_producer(const safe_ptr<frame_producer>&) {}  // nothrow\r
                \r
-       static const safe_ptr<frame_producer>& empty() // nothrow\r
-       {\r
-               struct empty_frame_producer : public frame_producer\r
-               {\r
-                       virtual safe_ptr<basic_frame> receive(){return basic_frame::empty();}\r
-                       virtual void set_frame_factory(const safe_ptr<frame_factory>&){}\r
-                       virtual std::wstring print() const { return L"empty";}\r
-               };\r
-               static safe_ptr<frame_producer> producer = make_safe<empty_frame_producer>();\r
-               return producer;\r
-       }       \r
+       static const safe_ptr<frame_producer>& empty(); // nothrow\r
 };\r
 \r
 safe_ptr<basic_frame> receive_and_follow(safe_ptr<frame_producer>& producer);\r

diff --git a/core/producer/frame_producer_device.h b/core/producer/frame_producer_device.h
index fe407dd9693ad57540fb94e80fa19f7bab9cdc34..5bbfe97d2d8e4bbe7f2a891b731e57b23e79ebd5 100644 (file)
--- a/core/producer/frame_producer_device.h
+++ b/core/producer/frame_producer_device.h
@@ -28,10 +28,10 @@
 #include <boost/signals2.hpp>\r
 #include <boost/thread/future.hpp>\r
 \r
-#include <functional>\r
-\r
 namespace caspar { namespace core {\r
 \r
+struct video_format_desc;\r
+\r
 ////////////////////////////////////////////////////////////////////////////////////////////////////\r
 /// \class     frame_producer_device\r
 ///\r
@@ -48,10 +48,11 @@ class frame_producer_device : boost::noncopyable
 public:\r
        typedef boost::signals2::signal<void(const std::map<int, safe_ptr<basic_frame>>&)> output_t;\r
         \r
-       boost::signals2::connection connect(const output_t::slot_type& subscriber);\r
-\r
        explicit frame_producer_device(const video_format_desc& format_desc);\r
        frame_producer_device(frame_producer_device&& other);\r
+       \r
+       boost::signals2::connection connect(const output_t::slot_type& subscriber);\r
+\r
        void swap(frame_producer_device& other);\r
                \r
        void load(int index, const safe_ptr<frame_producer>& producer, bool preview = false);\r

diff --git a/core/producer/transition/transition_producer.h b/core/producer/transition/transition_producer.h
index a70e21151700fd0d35c483c64906c7d707efd817..56d9fd6e57b12b583bf58b80b8df54270e34e842 100644 (file)
--- a/core/producer/transition/transition_producer.h
+++ b/core/producer/transition/transition_producer.h
@@ -20,6 +20,7 @@
 #pragma once\r
 \r
 #include "../frame_producer.h"\r
+#include "../../video_format.h"\r
 \r
 #include <common/utility/tweener.h>\r
 \r

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index 6fd45ae29f72c3844a5d320c3b5dbf99dac95195..12b71cdc485345fbfdae1359ae818ddb6a128294 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -29,7 +29,6 @@
 #include <common/concurrency/com_context.h>\r
 #include <common/exception/exceptions.h>\r
 #include <common/memory/memclr.h>\r
-#include <common/utility/timer.h>\r
 \r
 #include <core/producer/frame/frame_factory.h>\r
 #include <core/producer/frame/write_frame.h>\r

diff --git a/modules/ffmpeg/producer/video/video_decoder.cpp b/modules/ffmpeg/producer/video/video_decoder.cpp
index e71b72138f22da71380c5c0f2bcd1d46c1a076a6..1ba3b6d5f030b59497664b466e840037deeb1217 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.cpp
+++ b/modules/ffmpeg/producer/video/video_decoder.cpp
@@ -21,7 +21,6 @@
 \r
 #include "video_decoder.h"\r
 \r
-#include <common/memory/safe_ptr.h>\r
 #include <common/memory/memcpy.h>\r
 \r
 #include <core/video_format.h>\r
@@ -31,8 +30,6 @@
 \r
 #include <tbb/parallel_for.h>\r
 \r
-#include <algorithm>\r
-\r
 #if defined(_MSC_VER)\r
 #pragma warning (push)\r
 #pragma warning (disable : 4244)\r