projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply 2ee558ec90623b570360e8e55c918b5bb37f9aac from master; various snapping...
[dcpomatic.git]
/
src
/
lib
/
dcp_subtitle_decoder.cc
diff --git
a/src/lib/dcp_subtitle_decoder.cc
b/src/lib/dcp_subtitle_decoder.cc
index 20a9f32fee031ddd99fc03f19ab1d5182614e6f7..e3c06378b8eabd86216d8f08394e1db57152fab6 100644
(file)
--- a/
src/lib/dcp_subtitle_decoder.cc
+++ b/
src/lib/dcp_subtitle_decoder.cc
@@
-17,9
+17,9
@@
*/
*/
-#include <dcp/subtitle_content.h>
#include "dcp_subtitle_decoder.h"
#include "dcp_subtitle_content.h"
#include "dcp_subtitle_decoder.h"
#include "dcp_subtitle_content.h"
+#include <dcp/interop_subtitle_content.h>
using std::list;
using std::cout;
using std::list;
using std::cout;
@@
-28,8
+28,8
@@
using boost::shared_ptr;
DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
: SubtitleDecoder (content)
{
DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
: SubtitleDecoder (content)
{
-
dcp::SubtitleContent c (content->path (0), false
);
- _subtitles = c
.
subtitles ();
+
shared_ptr<dcp::SubtitleContent> c (load (content->path (0))
);
+ _subtitles = c
->
subtitles ();
_next = _subtitles.begin ();
}
_next = _subtitles.begin ();
}