X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fsubtitle.h;h=c3929d676ef721b39de7f6d68bbca40e6dce6513;hp=e3a853695f0fb313f2f20f2f5e6775e359eada92;hb=a0856e3fbef17f24073b01cb96be6bbcb229ecbc;hpb=42866530db49e0faf367ad28a55c658be60951bf

diff --git a/src/lib/subtitle.h b/src/lib/subtitle.h
index e3a853695..c3929d676 100644
--- 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;
@@ -65,7 +67,7 @@ class TimedSubtitle
 public:
 	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;
 };