Basic grunt-work, untested and unfinished, but it compiles.

[dcpomatic.git] / src / lib / ffmpeg_subtitle_stream.cc

diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc
index 6028d10a9bd8c7db6efc30e52291fdea329ee0e3..62accfaf871426aa751fb77dd3576adfd072559c 100644 (file)
--- a/src/lib/ffmpeg_subtitle_stream.cc
+++ b/src/lib/ffmpeg_subtitle_stream.cc
@@ -19,7 +19,7 @@
 */
 
 #include "ffmpeg_subtitle_stream.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -29,6 +29,7 @@ using std::map;
 using std::list;
 using std::cout;
 using std::make_pair;
+using dcp::raw_convert;
 
 /** Construct a SubtitleStream from a value returned from to_string().
  *  @param t String returned from to_string().
@@ -131,44 +132,34 @@ FFmpegSubtitleStream::add_text_subtitle (string id, ContentTimePeriod period)
        _text_subtitles[id] = period;
 }
 
-list<ContentTimePeriod>
-FFmpegSubtitleStream::image_subtitles_during (ContentTimePeriod period, bool starting) const
-{
-       return subtitles_during (period, starting, _image_subtitles);
-}
-
-list<ContentTimePeriod>
-FFmpegSubtitleStream::text_subtitles_during (ContentTimePeriod period, bool starting) const
-{
-       return subtitles_during (period, starting, _text_subtitles);
-}
-
-list<ContentTimePeriod>
-FFmpegSubtitleStream::subtitles_during (ContentTimePeriod period, bool starting, PeriodMap const & subs) const
+ContentTime
+FFmpegSubtitleStream::find_subtitle_to (string id) const
 {
-       list<ContentTimePeriod> d;
-
-       /* XXX: inefficient */
-       for (map<string, ContentTimePeriod>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
-               if ((starting && period.contains (i->second.from)) || (!starting && period.overlaps (i->second))) {
-                       d.push_back (i->second);
-               }
+       PeriodMap::const_iterator i = _image_subtitles.find (id);
+       if (i != _image_subtitles.end ()) {
+               return i->second.to;
        }
 
-       return d;
+       i = _text_subtitles.find (id);
+       DCPOMATIC_ASSERT (i != _text_subtitles.end ());
+       return i->second.to;
 }
 
-ContentTime
-FFmpegSubtitleStream::find_subtitle_to (string id) const
+/** @param id Subtitle id.
+ *  @return true if the `from' and `to' times for this id are equal, which indicates
+ *  that the `to' time is unknown.
+ */
+bool
+FFmpegSubtitleStream::unknown_to (string id) const
 {
        PeriodMap::const_iterator i = _image_subtitles.find (id);
        if (i != _image_subtitles.end ()) {
-               return i->second.to;
+               return i->second.from == i->second.to;
        }
 
        i = _text_subtitles.find (id);
        DCPOMATIC_ASSERT (i != _text_subtitles.end ());
-       return i->second.to;
+       return i->second.from == i->second.to;
 }
 
 /** Add some offset to all the times in the stream */
@@ -209,3 +200,19 @@ FFmpegSubtitleStream::has_image () const
 {
        return !_image_subtitles.empty ();
 }
+
+void
+FFmpegSubtitleStream::set_subtitle_to (string id, ContentTime to)
+{
+       PeriodMap::iterator i = _image_subtitles.find (id);
+       if (i != _image_subtitles.end ()) {
+               i->second.to = to;
+       } else {
+               i = _text_subtitles.find (id);
+               if (i != _text_subtitles.end ()) {
+                       i->second.to = to;
+               } else {
+                       DCPOMATIC_ASSERT (false);
+               }
+       }
+}