projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up J2KImageProxy a bit.
[dcpomatic.git]
/
src
/
lib
/
j2k_image_proxy.h
diff --git
a/src/lib/j2k_image_proxy.h
b/src/lib/j2k_image_proxy.h
index 1392f66b9cd9b33620c73c5f78c164a66a245a2d..34b1490b3858fb0a2eee07f693d8573a25ced4e6 100644
(file)
--- a/
src/lib/j2k_image_proxy.h
+++ b/
src/lib/j2k_image_proxy.h
@@
-18,6
+18,7
@@
*/
#include "image_proxy.h"
*/
#include "image_proxy.h"
+#include "data.h"
#include <dcp/util.h>
class Data;
#include <dcp/util.h>
class Data;
@@
-34,14
+35,16
@@
public:
void add_metadata (xmlpp::Node *) const;
void send_binary (boost::shared_ptr<Socket>) const;
void add_metadata (xmlpp::Node *) const;
void send_binary (boost::shared_ptr<Socket>) const;
- boost::shared_ptr<Data> j2k () const;
+ Data j2k () const {
+ return _data;
+ }
+
dcp::Size size () const {
return _size;
}
private:
dcp::Size size () const {
return _size;
}
private:
- boost::shared_ptr<const dcp::MonoPictureFrame> _mono;
- boost::shared_ptr<const dcp::StereoPictureFrame> _stereo;
+ Data _data;
dcp::Size _size;
boost::optional<dcp::Eye> _eye;
};
dcp::Size _size;
boost::optional<dcp::Eye> _eye;
};