From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Mon, 13 Jun 2011 12:59:13 +0000 (+0000)
Subject: 2.0. Misc cleanup.
X-Git-Tag: 2.0.1~430
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=dd11801d799fcb7e17c965014c43008558c36eec;p=casparcg

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 a94715bf5..01048ffb6 100644
--- a/core/mixer/audio/audio_mixer.h
+++ b/core/mixer/audio/audio_mixer.h
@@ -19,8 +19,9 @@
 */
 #pragma once
 
+#include <common/memory/safe_ptr.h>
+
 #include <core/producer/frame/frame_visitor.h>
-#include <core/producer/frame/audio_transform.h>
 
 #include <boost/noncopyable.hpp>
 
@@ -40,7 +41,7 @@ public:
 	audio_mixer& operator=(audio_mixer&& other);
 private:
 	struct implementation;
-	std::shared_ptr<implementation> impl_;
+	safe_ptr<implementation> impl_;
 };
 
 }}
\ No newline at end of file
diff --git a/core/mixer/gpu/device_buffer.cpp b/core/mixer/gpu/device_buffer.cpp
index ccf9d470d..c20e77982 100644
--- a/core/mixer/gpu/device_buffer.cpp
+++ b/core/mixer/gpu/device_buffer.cpp
@@ -21,6 +21,8 @@
 
 #include "device_buffer.h"
 
+#include "host_buffer.h"
+
 #include <common/gl/gl_check.h>
 
 namespace caspar { namespace core {
diff --git a/core/mixer/gpu/device_buffer.h b/core/mixer/gpu/device_buffer.h
index 3e4b5c80c..da71c6deb 100644
--- a/core/mixer/gpu/device_buffer.h
+++ b/core/mixer/gpu/device_buffer.h
@@ -19,14 +19,16 @@
 */
 #pragma once
 
-#include "../gpu/host_buffer.h"
+#include <common/memory/safe_ptr.h>
 
 #include <boost/noncopyable.hpp>
 
 #include <memory>
 
 namespace caspar { namespace core {
-	
+
+class host_buffer;
+
 class device_buffer : boost::noncopyable
 {
 public:
@@ -50,7 +52,7 @@ private:
 	device_buffer(size_t width, size_t height, size_t stride);
 
 	struct implementation;
-	std::shared_ptr<implementation> impl_;
+	safe_ptr<implementation> impl_;
 };
 
 }}
\ No newline at end of file
diff --git a/core/mixer/gpu/host_buffer.h b/core/mixer/gpu/host_buffer.h
index cf98c8e16..3fba42e8d 100644
--- a/core/mixer/gpu/host_buffer.h
+++ b/core/mixer/gpu/host_buffer.h
@@ -21,7 +21,7 @@
 
 #include <boost/noncopyable.hpp>
 
-#include <memory>
+#include <common/memory/safe_ptr.h>
 
 namespace caspar { namespace core {
 		
@@ -40,14 +40,15 @@ public:
 	
 	void bind();
 	void unbind();
-	void unmap();
+
 	void map();
+	void unmap();
 private:
 	friend class ogl_device;
 	host_buffer(size_t size, usage_t usage);
 
 	struct implementation;
-	std::shared_ptr<implementation> impl_;
+	safe_ptr<implementation> impl_;
 };
 
 }}
\ No newline at end of file
diff --git a/core/mixer/image/image_mixer.h b/core/mixer/image/image_mixer.h
index ed9a031af..b8c337389 100644
--- a/core/mixer/image/image_mixer.h
+++ b/core/mixer/image/image_mixer.h
@@ -21,9 +21,7 @@
 
 #include <common/memory/safe_ptr.h>
 
-#include <core/video_format.h>
 #include <core/producer/frame/frame_visitor.h>
-#include <core/producer/frame/pixel_format.h>
 
 #include <boost/noncopyable.hpp>
 
@@ -31,8 +29,8 @@ namespace caspar { namespace core {
 
 class write_frame;
 class host_buffer;
-class ogl_device;
-class video_channel_context;;
+class video_channel_context;
+struct pixel_format_desc;
 
 class image_mixer : public core::frame_visitor, boost::noncopyable
 {
diff --git a/core/mixer/mixer.h b/core/mixer/mixer.h
index b03fa8935..0fd2e562b 100644
--- a/core/mixer/mixer.h
+++ b/core/mixer/mixer.h
@@ -19,7 +19,6 @@
 */
 #pragma once
 
-#include "../producer/frame/pixel_format.h"
 #include "../producer/frame/frame_factory.h"
 
 #include <common/memory/safe_ptr.h>
@@ -38,6 +37,7 @@ class basic_frame;
 class audio_transform;
 class image_transform;
 class video_channel_context;;
+struct pixel_format;
 
 class mixer : public core::frame_factory
 {
diff --git a/core/mixer/read_frame.h b/core/mixer/read_frame.h
index f25d766ed..ebb2cacb1 100644
--- a/core/mixer/read_frame.h
+++ b/core/mixer/read_frame.h
@@ -23,8 +23,8 @@
 
 #include <boost/noncopyable.hpp>
 #include <boost/range/iterator_range.hpp>
-#include <boost/thread/future.hpp>
 
+#include <cstdint>
 #include <memory>
 #include <vector>
 
diff --git a/core/mixer/write_frame.h b/core/mixer/write_frame.h
index 06cdde00d..b741a57cb 100644
--- a/core/mixer/write_frame.h
+++ b/core/mixer/write_frame.h
@@ -26,9 +26,8 @@
 #include <boost/noncopyable.hpp>
 #include <boost/range/iterator_range.hpp>
 
-#include <memory>
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 namespace caspar { namespace core {
 
@@ -63,9 +62,8 @@ private:
 	const std::vector<safe_ptr<device_buffer>>& get_textures() const;
 
 	struct implementation;
-	std::shared_ptr<implementation> impl_;
+	safe_ptr<implementation> impl_;
 };
-typedef std::shared_ptr<write_frame> write_frame_impl_ptr;
 
 
 }}
\ No newline at end of file