\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
{\r
public:\r
read_frame();\r
- read_frame(ogl_device& ogl, size_t size, boost::unique_future<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 int16_t*> audio_data();\r
+ virtual const boost::iterator_range<const int32_t*> audio_data();\r
\r
virtual size_t image_size() const;\r
\r