diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-30 00:05:34 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-12-04 21:14:06 +0000 |
| commit | 6c19b21e12f73ce63edd406ea617ff25bcc9bfea (patch) | |
| tree | a671b7fd9913abef6eda535ed2551328a078cbcc /src/lib/reel_writer.h | |
| parent | b1991796d6a4cbed8f8e1378bedbf7ecbf9647a2 (diff) | |
Use libdcp's compress_j2k; move Data into libdcp.
Diffstat (limited to 'src/lib/reel_writer.h')
| -rw-r--r-- | src/lib/reel_writer.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h index 3adaaf477..64b62fe22 100644 --- a/src/lib/reel_writer.h +++ b/src/lib/reel_writer.h @@ -18,7 +18,6 @@ */ #include "types.h" -#include "data.h" #include "dcpomatic_time.h" #include "referenced_reel_asset.h" #include "player_subtitles.h" @@ -49,7 +48,7 @@ class ReelWriter public: ReelWriter (boost::shared_ptr<const Film> film, DCPTimePeriod period, boost::shared_ptr<Job> job); - void write (boost::optional<Data> encoded, Frame frame, Eyes eyes); + void write (boost::optional<dcp::Data> encoded, Frame frame, Eyes eyes); void fake_write (Frame frame, Eyes eyes, int size); void repeat_write (Frame frame, Eyes eyes); void write (boost::shared_ptr<const AudioBuffers> audio); @@ -95,7 +94,7 @@ private: /** the first frame index that does not already exist in our MXF */ int _first_nonexistant_frame; /** the data of the last written frame, if there is one */ - boost::optional<Data> _last_written[EYES_COUNT]; + boost::optional<dcp::Data> _last_written[EYES_COUNT]; /** the index of the last written video frame within the reel */ int _last_written_video_frame; Eyes _last_written_eyes; |