Bump version

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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index d1aa3a0b56ec88f04e1078b5998f99f2f639d912..6ab95d2fe9d2bf53a08acd050845721ed40fc1a1 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -37,11 +37,10 @@ class FFmpegStream
 public:
        FFmpegStream (std::string n, int i)
                : name (n)
-               , id (i)
-               , _legacy_id (false)
+               , _id (i)
        {}
                                
-       FFmpegStream (boost::shared_ptr<const cxml::Node>, int);
+       FFmpegStream (boost::shared_ptr<const cxml::Node>);
 
        void as_xml (xmlpp::Node *) const;
 
@@ -52,12 +51,21 @@ public:
        bool uses_index (AVFormatContext const * c, int index) const;
        AVStream* stream (AVFormatContext const * c) const;
 
+       std::string technical_summary () const {
+               return "id " + boost::lexical_cast<std::string> (_id);
+       }
+
+       std::string identifier () const {
+               return boost::lexical_cast<std::string> (_id);
+       }
+
        std::string name;
-       int id;
+
+       friend bool operator== (FFmpegStream const & a, FFmpegStream const & b);
+       friend bool operator!= (FFmpegStream const & a, FFmpegStream const & b);
        
 private:
-       /** If this is true, id is in fact the index */
-       bool _legacy_id;
+       int _id;
 };
 
 class FFmpegAudioStream : public FFmpegStream
@@ -93,9 +101,6 @@ private:
        {}
 };
 
-extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
-extern bool operator!= (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
-
 class FFmpegSubtitleStream : public FFmpegStream
 {
 public:
@@ -103,14 +108,11 @@ public:
                : FFmpegStream (n, i)
        {}
        
-       FFmpegSubtitleStream (boost::shared_ptr<const cxml::Node>, int);
+       FFmpegSubtitleStream (boost::shared_ptr<const cxml::Node>);
 
        void as_xml (xmlpp::Node *) const;
 };
 
-extern bool operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b);
-extern bool operator!= (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b);
-
 class FFmpegContentProperty : public VideoContentProperty
 {
 public:
@@ -125,7 +127,7 @@ class FFmpegContent : public VideoContent, public AudioContent, public SubtitleC
 {
 public:
        FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-       FFmpegContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int version);
+       FFmpegContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int version, std::list<std::string> &);
        FFmpegContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 
        boost::shared_ptr<FFmpegContent> shared_from_this () {
@@ -148,6 +150,7 @@ public:
        int output_audio_frame_rate () const;
        AudioMapping audio_mapping () const;
        void set_audio_mapping (AudioMapping);
+       boost::filesystem::path audio_analysis_path () const;
 
        void set_filters (std::vector<Filter const *> const &);