Merge master.

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

diff --git a/src/lib/content_subtitle.cc b/src/lib/content_subtitle.cc
index 11873afee0a3791f00a28c10a5422c09ac4173ce..93e0677bb7c3c49031555af796a3425ae49ccd4c 100644 (file)
--- a/src/lib/content_subtitle.cc
+++ b/src/lib/content_subtitle.cc
@@ -19,18 +19,13 @@
 
 #include "content_subtitle.h"
 
-ContentTime
-ContentTextSubtitle::from () const
+ContentTimePeriod
+ContentTextSubtitle::period () const
 {
        /* XXX: assuming we have some subs and they are all at the same time */
        assert (!subs.empty ());
-       return ContentTime::from_seconds (double (subs.front().in().to_ticks()) / 250);
-}
-
-ContentTime
-ContentTextSubtitle::to () const
-{
-       /* XXX: assuming we have some subs and they are all at the same time */
-       assert (!subs.empty ());
-       return ContentTime::from_seconds (double (subs.front().out().to_ticks()) / 250);
+       return ContentTimePeriod (
+               ContentTime::from_seconds (double (subs.front().in().to_ticks()) / 250),
+               ContentTime::from_seconds (double (subs.front().out().to_ticks()) / 250)
+               );
 }