2.0. audio:

[casparcg] / core / mixer / read_frame.h

diff --git a/core/mixer/read_frame.h b/core/mixer/read_frame.h
index f25d766ede4a93c4c8fd0531767917ed574690e3..976ca39f90d42517d52a2af045cc87470fe21267 100644 (file)
--- a/core/mixer/read_frame.h
+++ b/core/mixer/read_frame.h
@@ -21,10 +21,12 @@
 \r
 #include <common/memory/safe_ptr.h>\r
 \r
+#include <core/mixer/audio/audio_mixer.h>\r
+\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
@@ -37,10 +39,12 @@ class read_frame : boost::noncopyable
 {\r
 public:\r
        read_frame();\r
-       read_frame(ogl_device& ogl, safe_ptr<host_buffer>&& image_data, std::vector<int16_t>&& audio_data);\r
+       read_frame(ogl_device& ogl, size_t size, safe_ptr<host_buffer>&& image_data, audio_buffer&& audio_data);\r
+\r
+       virtual const boost::iterator_range<const uint8_t*> image_data();\r
+       virtual const boost::iterator_range<const int32_t*> audio_data();\r
 \r
-       virtual const boost::iterator_range<const uint8_t*> image_data() const;\r
-       virtual const boost::iterator_range<const int16_t*> audio_data() const;\r
+       virtual size_t image_size() const;\r
                \r
 private:\r
        struct implementation;\r