2.0. audio:

[casparcg] / core / mixer / write_frame.h

diff --git a/core/mixer/write_frame.h b/core/mixer/write_frame.h
index 43879554c2955efe5c7e70ee67bc768472c8ca69..cf95d1728c5a05c2c9c269dabb53ea718a7c6381 100644 (file)
--- a/core/mixer/write_frame.h
+++ b/core/mixer/write_frame.h
@@ -23,6 +23,7 @@
 \r
 #include <core/producer/frame/basic_frame.h>\r
 #include <core/video_format.h>\r
+#include <core/mixer/audio/audio_mixer.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 #include <boost/range/iterator_range.hpp>\r
@@ -32,7 +33,6 @@
 \r
 namespace caspar { namespace core {\r
 \r
-class host_buffer;\r
 class device_buffer;\r
 struct frame_visitor;\r
 struct pixel_format_desc;\r
@@ -41,28 +41,39 @@ class ogl_device;
 class write_frame : public core::basic_frame, boost::noncopyable\r
 {\r
 public:        \r
-       write_frame(const void* tag);\r
+       explicit write_frame(const void* tag);\r
        explicit write_frame(ogl_device& ogl, const void* tag, const core::pixel_format_desc& desc);\r
+\r
        write_frame(const write_frame& other);\r
+       write_frame(write_frame&& other);\r
+\r
+       write_frame& operator=(const write_frame& other);\r
+       write_frame& operator=(write_frame&& other);\r
+               \r
+       void swap(write_frame& other);\r
                        \r
-       virtual boost::iterator_range<uint8_t*> image_data(size_t plane_index = 0);     \r
-       virtual std::vector<int16_t>& audio_data();\r
-       \r
-       virtual const boost::iterator_range<const uint8_t*> image_data(size_t plane_index = 0) const;\r
-       virtual const boost::iterator_range<const int16_t*> audio_data() const;\r
+       boost::iterator_range<uint8_t*> image_data(size_t plane_index = 0);     \r
+       const boost::iterator_range<const uint8_t*> image_data(size_t plane_index = 0) const;\r
 \r
+       audio_buffer& audio_data();\r
+       const boost::iterator_range<const int32_t*> audio_data() const;\r
+       \r
        void commit(uint32_t plane_index);\r
        void commit();\r
        \r
-       void set_type(const core::video_mode::type& mode);\r
-       core::video_mode::type get_type() const;\r
+       void set_type(const core::field_mode::type& mode);\r
+       core::field_mode::type get_type() const;\r
        \r
-       virtual void accept(core::frame_visitor& visitor);\r
-\r
-       virtual const void* tag() const;\r
+       const void* tag() const;\r
 \r
        const core::pixel_format_desc& get_pixel_format_desc() const;\r
        \r
+       // basic_frame\r
+\r
+       virtual void accept(core::frame_visitor& visitor);\r
+\r
+       virtual std::wstring print() const;\r
+       \r
 private:\r
        friend class image_mixer;\r
        \r