Accessor for ClosedCaptionsDialog.

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

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index 43efcf74f456fd031cb900aab1ae3c5d58c65238..10517055c26cf842619699a901bc561ff00a8fde 100644 (file)
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2016 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/>.
 
 */
 
@@ -39,7 +40,7 @@ class Log;
 class FFmpeg
 {
 public:
-       FFmpeg (boost::shared_ptr<const FFmpegContent>);
+       explicit FFmpeg (boost::shared_ptr<const FFmpegContent>);
        virtual ~FFmpeg ();
 
        boost::shared_ptr<const FFmpegContent> ffmpeg_content () const {
@@ -52,13 +53,11 @@ public:
 protected:
        AVCodecContext* video_codec_context () const;
        AVCodecContext* subtitle_codec_context () const;
-       ContentTime pts_offset (
-               std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams, boost::optional<ContentTime> first_video, double video_frame_rate
+       dcpomatic::ContentTime pts_offset (
+               std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams, boost::optional<dcpomatic::ContentTime> first_video, double video_frame_rate
                ) const;
 
        static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const & sub);
-       static std::string subtitle_id (AVSubtitle const & sub);
-       static bool subtitle_starts_image (AVSubtitle const & sub);
 
        boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
 
@@ -72,7 +71,7 @@ protected:
        AVFrame* _frame;
 
        /** Index of video stream within AVFormatContext */
-       int _video_stream;
+       boost::optional<int> _video_stream;
 
        /* It would appear (though not completely verified) that one must have
           a mutex around calls to avcodec_open* and avcodec_close... and here