diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-10 14:04:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-10 14:04:10 +0100 |
| commit | 5c0a67869dbddb924c9f5ccb4126aa06d85b9b8b (patch) | |
| tree | c923ed014e373f5ad84cfe82f3736bcba6b7eabf /src/lib/j2k_image_proxy.cc | |
| parent | 717ad0a42f8f3b744ad3bffcb094518ad59ef7b3 (diff) | |
Rename EncodedData -> Data and trim it a bit.
Diffstat (limited to 'src/lib/j2k_image_proxy.cc')
| -rw-r--r-- | src/lib/j2k_image_proxy.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 59106098a..3fc6ce9b2 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -20,7 +20,7 @@ #include "j2k_image_proxy.h" #include "dcpomatic_socket.h" #include "image.h" -#include "encoded_data.h" +#include "data.h" #include "raw_convert.h" #include <dcp/mono_picture_frame.h> #include <dcp/stereo_picture_frame.h> @@ -116,16 +116,16 @@ J2KImageProxy::send_binary (shared_ptr<Socket> socket) const } } -shared_ptr<EncodedData> +shared_ptr<Data> J2KImageProxy::j2k () const { if (_mono) { - return shared_ptr<EncodedData> (new EncodedData (_mono->j2k_data(), _mono->j2k_size())); + return shared_ptr<Data> (new Data (_mono->j2k_data(), _mono->j2k_size())); } else { if (_eye.get() == dcp::EYE_LEFT) { - return shared_ptr<EncodedData> (new EncodedData (_stereo->left_j2k_data(), _stereo->left_j2k_size())); + return shared_ptr<Data> (new Data (_stereo->left_j2k_data(), _stereo->left_j2k_size())); } else { - return shared_ptr<EncodedData> (new EncodedData (_stereo->right_j2k_data(), _stereo->right_j2k_size())); + return shared_ptr<Data> (new Data (_stereo->right_j2k_data(), _stereo->right_j2k_size())); } } } |