Merge master.

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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 2339705d0d17377768b9bd1dbae0f7d2cbda3f2c..d93660cd0fa573eb391c0a9f4fdf039f524cc9b6 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;
 };
@@ -137,13 +139,13 @@ public:
        std::string technical_summary () const;
        std::string information () const;
        void as_xml (xmlpp::Node *) const;
-       Time full_length () const;
+       DCPTime full_length () const;
 
        std::string identifier () const;
        
        /* AudioContent */
        int audio_channels () const;
-       AudioContent::Frame audio_length () const;
+       ContentTime audio_length () const;
        int content_audio_frame_rate () const;
        int output_audio_frame_rate () const;
        AudioMapping audio_mapping () const;