summaryrefslogtreecommitdiff
path: root/src/lib/decoded.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-02-11 15:39:30 +0000
committerCarl Hetherington <cth@carlh.net>2014-02-11 15:39:30 +0000
commitc28b3d6f168607aca9995282b96647eb64a26dc9 (patch)
treea939edd65299674d3e522f3b3248b572ec1e351f /src/lib/decoded.h
parent8aeb741ccbe2edb528e98a431bf55459a6836a9b (diff)
Partial hacks to use of libdcp 1.0.
Diffstat (limited to 'src/lib/decoded.h')
-rw-r--r--src/lib/decoded.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/decoded.h b/src/lib/decoded.h
index f4ebe0dbd..db62dfbe1 100644
--- a/src/lib/decoded.h
+++ b/src/lib/decoded.h
@@ -20,7 +20,7 @@
#ifndef DCPOMATIC_LIB_DECODED_H
#define DCPOMATIC_LIB_DECODED_H
-#include <libdcp/subtitle_asset.h>
+#include <libdcp/subtitle_string.h>
#include "types.h"
#include "rect.h"
#include "util.h"
@@ -123,7 +123,7 @@ public:
: dcp_time_to (0)
{}
- DecodedTextSubtitle (std::list<libdcp::Subtitle> s)
+ DecodedTextSubtitle (std::list<dcp::SubtitleString> s)
: subs (s)
{}
@@ -138,7 +138,7 @@ public:
dcp_time_to = rint (subs.front().out().to_ticks() * 4 * TIME_HZ / frc.speed_up) + offset;
}
- std::list<libdcp::Subtitle> subs;
+ std::list<dcp::SubtitleString> subs;
DCPTime dcp_time_to;
};