Bump version

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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 2339705d0d17377768b9bd1dbae0f7d2cbda3f2c..6ab95d2fe9d2bf53a08acd050845721ed40fc1a1 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -38,10 +38,9 @@ public:
        FFmpegStream (std::string n, int i)
                : name (n)
                , _id (i)
-               , _legacy_id (false)
        {}
                                
-       FFmpegStream (boost::shared_ptr<const cxml::Node>, int);
+       FFmpegStream (boost::shared_ptr<const cxml::Node>);
 
        void as_xml (xmlpp::Node *) const;
 
@@ -52,9 +51,14 @@ public:
        bool uses_index (AVFormatContext const * c, int index) const;
        AVStream* stream (AVFormatContext const * c) const;
 
-       int id () const {
-               return _id;
+       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;
 
        friend bool operator== (FFmpegStream const & a, FFmpegStream const & b);
@@ -62,8 +66,6 @@ public:
        
 private:
        int _id;
-       /** If this is true, id is in fact the index */
-       bool _legacy_id;
 };
 
 class FFmpegAudioStream : public FFmpegStream
@@ -106,7 +108,7 @@ 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;
 };
@@ -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 &);