Merge branch 'master' into content-rework-take5

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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 83474ea6679c15ab6154d984bc0c410c3983f54a..95e24b7b3ef29e8e29e20ca63340c05ee4b4c167 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -15,6 +15,10 @@ public:
                 , channel_layout (c)
         {}
 
+       FFmpegAudioStream (boost::shared_ptr<const cxml::Node>);
+
+       void as_xml (xmlpp::Node *) const;
+       
         int channels () const {
                 return av_get_channel_layout_nb_channels (channel_layout);
         }
@@ -35,6 +39,10 @@ public:
                 , id (i)
         {}
         
+       FFmpegSubtitleStream (boost::shared_ptr<const cxml::Node>);
+
+       void as_xml (xmlpp::Node *) const;
+       
         std::string name;
         int id;
 };
@@ -54,9 +62,11 @@ class FFmpegContent : public VideoContent, public AudioContent, public boost::en
 {
 public:
        FFmpegContent (boost::filesystem::path);
+       FFmpegContent (boost::shared_ptr<const cxml::Node>);
        
        void examine (boost::shared_ptr<Film>, boost::shared_ptr<Job>, bool);
        std::string summary () const;
+       void as_xml (xmlpp::Node *) const;
 
         /* AudioContent */
         int audio_channels () const;