C++11 tidying.

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

diff --git a/src/lib/ffmpeg_subtitle_period.h b/src/lib/ffmpeg_subtitle_period.h
index b6565a2a2b311bac3f4179d8c07e7f4cd27182b3..0841207ad5f677372e14678adf8c8ea7ed43fed4 100644 (file)
--- a/src/lib/ffmpeg_subtitle_period.h
+++ b/src/lib/ffmpeg_subtitle_period.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -23,15 +24,15 @@
 class FFmpegSubtitlePeriod
 {
 public:
-       FFmpegSubtitlePeriod (ContentTime f)
+       explicit FFmpegSubtitlePeriod (dcpomatic::ContentTime f)
                : from (f)
        {}
 
-       FFmpegSubtitlePeriod (ContentTime f, ContentTime t)
+       FFmpegSubtitlePeriod (dcpomatic::ContentTime f, dcpomatic::ContentTime t)
                : from (f)
                , to (t)
        {}
 
-       ContentTime from;
-       boost::optional<ContentTime> to;
+       dcpomatic::ContentTime from;
+       boost::optional<dcpomatic::ContentTime> to;
 };