2.0. Misc cleanup.

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

diff --git a/core/mixer/audio/audio_mixer.h b/core/mixer/audio/audio_mixer.h
index a94715bf5f25da4f1b6e1f75f73b7f4e5f8233fb..01048ffb6edc091ccfafefeaf04484bf59b4a0ef 100644 (file)
--- a/core/mixer/audio/audio_mixer.h
+++ b/core/mixer/audio/audio_mixer.h
@@ -19,8 +19,9 @@
 */\r
 #pragma once\r
 \r
+#include <common/memory/safe_ptr.h>\r
+\r
 #include <core/producer/frame/frame_visitor.h>\r
-#include <core/producer/frame/audio_transform.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
@@ -40,7 +41,7 @@ public:
        audio_mixer& operator=(audio_mixer&& other);\r
 private:\r
        struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       safe_ptr<implementation> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/core/mixer/gpu/device_buffer.cpp b/core/mixer/gpu/device_buffer.cpp
index ccf9d470d6d178fce02bf24c99bac645c85aedd8..c20e77982f594e6d9b698d6b3652ce6f54d92486 100644 (file)
--- a/core/mixer/gpu/device_buffer.cpp
+++ b/core/mixer/gpu/device_buffer.cpp
@@ -21,6 +21,8 @@
 \r
 #include "device_buffer.h"\r
 \r
+#include "host_buffer.h"\r
+\r
 #include <common/gl/gl_check.h>\r
 \r
 namespace caspar { namespace core {\r

diff --git a/core/mixer/gpu/device_buffer.h b/core/mixer/gpu/device_buffer.h
index 3e4b5c80cba7d796daf0b9fdcc04c25dba6c4194..da71c6deb735cf66a3bb8baaf9c69458c834c09a 100644 (file)
--- a/core/mixer/gpu/device_buffer.h
+++ b/core/mixer/gpu/device_buffer.h
@@ -19,14 +19,16 @@
 */\r
 #pragma once\r
 \r
-#include "../gpu/host_buffer.h"\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
 #include <memory>\r
 \r
 namespace caspar { namespace core {\r
-       \r
+\r
+class host_buffer;\r
+\r
 class device_buffer : boost::noncopyable\r
 {\r
 public:\r
@@ -50,7 +52,7 @@ private:
        device_buffer(size_t width, size_t height, size_t stride);\r
 \r
        struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       safe_ptr<implementation> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/core/mixer/gpu/host_buffer.h b/core/mixer/gpu/host_buffer.h
index cf98c8e16958f8eabef1dadf97bfed9524e52130..3fba42e8df6a8e0ffa6f7d011e1dbdb913d53c74 100644 (file)
--- a/core/mixer/gpu/host_buffer.h
+++ b/core/mixer/gpu/host_buffer.h
@@ -21,7 +21,7 @@
 \r
 #include <boost/noncopyable.hpp>\r
 \r
-#include <memory>\r
+#include <common/memory/safe_ptr.h>\r
 \r
 namespace caspar { namespace core {\r
                \r
@@ -40,14 +40,15 @@ public:
        \r
        void bind();\r
        void unbind();\r
-       void unmap();\r
+\r
        void map();\r
+       void unmap();\r
 private:\r
        friend class ogl_device;\r
        host_buffer(size_t size, usage_t usage);\r
 \r
        struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       safe_ptr<implementation> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/core/mixer/image/image_mixer.h b/core/mixer/image/image_mixer.h
index ed9a031af16a7a0f1a0be80fac91ee715cc240f6..b8c337389e75c99c4237b49f8674f95ff87d6608 100644 (file)
--- a/core/mixer/image/image_mixer.h
+++ b/core/mixer/image/image_mixer.h
@@ -21,9 +21,7 @@
 \r
 #include <common/memory/safe_ptr.h>\r
 \r
-#include <core/video_format.h>\r
 #include <core/producer/frame/frame_visitor.h>\r
-#include <core/producer/frame/pixel_format.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
@@ -31,8 +29,8 @@ namespace caspar { namespace core {
 \r
 class write_frame;\r
 class host_buffer;\r
-class ogl_device;\r
-class video_channel_context;;\r
+class video_channel_context;\r
+struct pixel_format_desc;\r
 \r
 class image_mixer : public core::frame_visitor, boost::noncopyable\r
 {\r

diff --git a/core/mixer/mixer.h b/core/mixer/mixer.h
index b03fa89356c458526378be6901bc375dbb5a86ea..0fd2e562b5f4fa1ef23d838f83ef8cfb96d21423 100644 (file)
--- a/core/mixer/mixer.h
+++ b/core/mixer/mixer.h
@@ -19,7 +19,6 @@
 */\r
 #pragma once\r
 \r
-#include "../producer/frame/pixel_format.h"\r
 #include "../producer/frame/frame_factory.h"\r
 \r
 #include <common/memory/safe_ptr.h>\r
@@ -38,6 +37,7 @@ class basic_frame;
 class audio_transform;\r
 class image_transform;\r
 class video_channel_context;;\r
+struct pixel_format;\r
 \r
 class mixer : public core::frame_factory\r
 {\r

diff --git a/core/mixer/read_frame.h b/core/mixer/read_frame.h
index f25d766ede4a93c4c8fd0531767917ed574690e3..ebb2cacb1b2dfd09bfe1cc9a90bb55558c067088 100644 (file)
--- a/core/mixer/read_frame.h
+++ b/core/mixer/read_frame.h
@@ -23,8 +23,8 @@
 \r
 #include <boost/noncopyable.hpp>\r
 #include <boost/range/iterator_range.hpp>\r
-#include <boost/thread/future.hpp>\r
 \r
+#include <cstdint>\r
 #include <memory>\r
 #include <vector>\r
 \r

diff --git a/core/mixer/write_frame.h b/core/mixer/write_frame.h
index 06cdde00d04c28afa48b2dc6e9333947cd409dde..b741a57cbfdd60156eae838866164dbd732ed04f 100644 (file)
--- a/core/mixer/write_frame.h
+++ b/core/mixer/write_frame.h
@@ -26,9 +26,8 @@
 #include <boost/noncopyable.hpp>\r
 #include <boost/range/iterator_range.hpp>\r
 \r
-#include <memory>\r
-#include <vector>\r
 #include <cstdint>\r
+#include <vector>\r
 \r
 namespace caspar { namespace core {\r
 \r
@@ -63,9 +62,8 @@ private:
        const std::vector<safe_ptr<device_buffer>>& get_textures() const;\r
 \r
        struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       safe_ptr<implementation> impl_;\r
 };\r
-typedef std::shared_ptr<write_frame> write_frame_impl_ptr;\r
 \r
 \r
 }}
\ No newline at end of file