Merge master.

[dcpomatic.git] / src / lib / subtitle.h

diff --git a/src/lib/subtitle.h b/src/lib/subtitle.h
index 590e0dd31b8ac2865d680b5f3e7343bc76560e39..c3929d676ef721b39de7f6d68bbca40e6dce6513 100644 (file)
--- a/src/lib/subtitle.h
+++ b/src/lib/subtitle.h
@@ -1,3 +1,5 @@
+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
@@ -23,7 +25,7 @@
 
 #include <list>
 #include <boost/shared_ptr.hpp>
-#include "util.h"
+#include "types.h"
 
 struct AVSubtitle;
 class Image;
@@ -46,26 +48,26 @@ public:
                return _image;
        }
 
-       Rect area () const;
+       dvdomatic::Rect area () const;
        
 private:
        Position _position;
        boost::shared_ptr<Image> _image;
 };
 
-Rect
+dvdomatic::Rect
 subtitle_transformed_area (
        float target_x_scale, float target_y_scale,
-       Rect sub_area, int subtitle_offset, float subtitle_scale
+       dvdomatic::Rect sub_area, int subtitle_offset, float subtitle_scale
        );
 
 /** A Subtitle class with details of the time over which it should be shown */
 class TimedSubtitle
 {
 public:
-       TimedSubtitle (AVSubtitle const &, double c);
+       TimedSubtitle (AVSubtitle const &);
 
-       bool displayed_at (double t) const;
+       bool displayed_at (Time) const;
        
        boost::shared_ptr<Subtitle> subtitle () const {
                return _subtitle;
@@ -74,8 +76,8 @@ public:
 private:
        /** the subtitle */
        boost::shared_ptr<Subtitle> _subtitle;
-       /** display from time in seconds from the start of the film */
-       double _from;
-       /** display to time in seconds from the start of the film */
-       double _to;
+       /** display from time from the start of the content */
+       Time _from;
+       /** display to time from the start of the content */
+       Time _to;
 };