Logging improvements to allow prettier displays in the server GUI.
[dcpomatic.git] / src / lib / subtitle_decoder.h
index 8ba74404f2d26dbc3a80c9494c20dd233e9396ef..d01c4e45b0ba5480567818d3f53809d1683fa325 100644 (file)
@@ -26,8 +26,6 @@
 #include "content_subtitle.h"
 #include <dcp/subtitle_string.h>
 
-class Film;
-class DCPTimedSubtitle;
 class Image;
 
 class SubtitleDecoder : public virtual Decoder
@@ -40,9 +38,9 @@ public:
 
 protected:
        void seek (ContentTime, bool);
-       
+
        void image_subtitle (ContentTimePeriod period, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
-       void text_subtitle (std::list<dcp::SubtitleString>);
+       void text_subtitle (ContentTimePeriod period, std::list<dcp::SubtitleString>);
 
        std::list<ContentImageSubtitle> _decoded_image_subtitles;
        std::list<ContentTextSubtitle> _decoded_text_subtitles;
@@ -56,7 +54,7 @@ private:
         */
        virtual std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod period, bool starting) const = 0;
        virtual std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod period, bool starting) const = 0;
-       
+
        boost::shared_ptr<const SubtitleContent> _subtitle_content;
 };