summaryrefslogtreecommitdiff
path: root/src/lib/writer.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-11-30 00:05:34 +0000
committerCarl Hetherington <cth@carlh.net>2015-12-04 21:14:06 +0000
commit6c19b21e12f73ce63edd406ea617ff25bcc9bfea (patch)
treea671b7fd9913abef6eda535ed2551328a078cbcc /src/lib/writer.h
parentb1991796d6a4cbed8f8e1378bedbf7ecbf9647a2 (diff)
Use libdcp's compress_j2k; move Data into libdcp.
Diffstat (limited to 'src/lib/writer.h')
-rw-r--r--src/lib/writer.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/writer.h b/src/lib/writer.h
index 5c974f0f3..0e17f998d 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -23,7 +23,6 @@
#include "types.h"
#include "player_subtitles.h"
-#include "data.h"
#include "exception_store.h"
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
@@ -31,8 +30,11 @@
#include <boost/thread/condition.hpp>
#include <list>
+namespace dcp {
+ class Data;
+}
+
class Film;
-class Data;
class AudioBuffers;
class Job;
class Font;
@@ -58,7 +60,7 @@ public:
} type;
/** encoded data for FULL */
- boost::optional<Data> encoded;
+ boost::optional<dcp::Data> encoded;
/** size of data for FAKE */
int size;
/** reel index */
@@ -93,7 +95,7 @@ public:
bool can_fake_write (Frame) const;
- void write (Data, Frame, Eyes);
+ void write (dcp::Data, Frame, Eyes);
void fake_write (Frame, Eyes);
bool can_repeat (Frame) const;
void repeat (Frame, Eyes);