Merge master.

[dcpomatic.git] / src / lib / subtitle_decoder.h

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 82662d192fbd1295d8574d7001b44d413984c353..78ee6801ecd89eb85c755af7f488103570203e8b 100644 (file)
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -21,7 +21,7 @@
 #define DCPOMATIC_SUBTITLE_DECODER_H
 
 #include <boost/signals2.hpp>
-#include <libdcp/subtitle_asset.h>
+#include <dcp/subtitle_string.h>
 #include "decoder.h"
 #include "rect.h"
 #include "types.h"
@@ -34,11 +34,11 @@ class Image;
 class SubtitleDecoder : public virtual Decoder
 {
 public:
-       SubtitleDecoder (boost::shared_ptr<const Film>);
+       SubtitleDecoder ();
 
 protected:
        void image_subtitle (boost::shared_ptr<Image>, dcpomatic::Rect<double>, ContentTime, ContentTime);
-       void text_subtitle (std::list<libdcp::Subtitle>);
+       void text_subtitle (std::list<dcp::SubtitleString>);
 };
 
 #endif