Various Doxygen fixes.

[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 eb870c24164e3bb362b8385d2ff8f6162b8c23d5..3935e23a95d8b02e3d3cf596e1745c7a2fbcc43c 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,10 +29,11 @@ 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().
- *  @param v State file version.
+ *  @param node String returned from to_string().
+ *  @param version State file version.
  */
 FFmpegSubtitleStream::FFmpegSubtitleStream (cxml::ConstNodePtr node, int version)
        : FFmpegStream (node)
@@ -131,53 +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);
-}
-
-struct PeriodSorter
-{
-       bool operator() (ContentTimePeriod const & a, ContentTimePeriod const & b) {
-               return a.from < b.from;
-       }
-};
-
-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.overlap(i->second))) {
-                       d.push_back (i->second);
-               }
+       PeriodMap::const_iterator i = _image_subtitles.find (id);
+       if (i != _image_subtitles.end ()) {
+               return i->second.to;
        }
 
-       d.sort (PeriodSorter ());
-
-       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 */
@@ -218,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);
+               }
+       }
+}