summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-12-23 00:07:21 +0000
committerCarl Hetherington <cth@carlh.net>2014-12-23 00:07:21 +0000
commit86c09d276bc4d2a85321f8c1ba4f06c1cdf25b7c (patch)
tree3897ff25a6bae2629ea2dd4857e764a47efe3d37 /src
parent92fcfff515d8416c8b175cb5e68dd492963362d5 (diff)
Fix warning and add comment.
Diffstat (limited to 'src')
-rw-r--r--src/lib/dcp_decoder.cc3
-rw-r--r--src/lib/subtitle_decoder.h5
2 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index f6d632f92..51d16b43c 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -133,7 +133,8 @@ DCPDecoder::seek (ContentTime t, bool accurate)
list<ContentTimePeriod>
-DCPDecoder::subtitles_during (ContentTimePeriod, bool starting) const
+DCPDecoder::subtitles_during (ContentTimePeriod, bool) const
{
+ /* XXX */
return list<ContentTimePeriod> ();
}
diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 3d4f90ad9..d7faaa014 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -51,7 +51,10 @@ private:
template <class T>
std::list<T> get (std::list<T> const & subs, ContentTimePeriod period, bool starting);
- virtual std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const = 0;
+ /** @param starting true if we want only subtitles that start during the period, otherwise
+ * we want subtitles that overlap the period.
+ */
+ virtual std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod period, bool starting) const = 0;
boost::shared_ptr<const SubtitleContent> _subtitle_content;
};