Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

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

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index e87e11d1c7db29249e360963057a44a90c1aa647..c3dde84fe11b0bc46227e9949f4c8ccb4c4b6488 100644 (file)
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    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/>.
 
 */
 
@@ -25,12 +26,15 @@ struct AVStream;
 
 class FFmpegAudioStream;
 class FFmpegSubtitleStream;
+class Job;
 
 class FFmpegExaminer : public FFmpeg, public VideoExaminer
 {
 public:
        FFmpegExaminer (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Job> job = boost::shared_ptr<Job> ());
 
+       bool has_video () const;
+
        boost::optional<double> video_frame_rate () const;
        dcp::Size video_size () const;
        Frame video_length () const;
@@ -73,7 +77,6 @@ private:
        void subtitle_packet (AVCodecContext *, boost::shared_ptr<FFmpegSubtitleStream>);
 
        std::string stream_name (AVStream* s) const;
-       std::string audio_stream_name (AVStream* s) const;
        std::string subtitle_stream_name (AVStream* s) const;
        boost::optional<ContentTime> frame_time (AVStream* s) const;
 
@@ -88,12 +91,15 @@ private:
 
        struct SubtitleStart
        {
-               SubtitleStart (std::string id_, ContentTime time_)
+               SubtitleStart (std::string id_, bool image_, ContentTime time_)
                        : id (id_)
+                       , image (image_)
                        , time (time_)
                {}
 
                std::string id;
+               /** true if it's an image subtitle, false for text */
+               bool image;
                ContentTime time;
        };