Fix crash.

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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index dba06990b8567313421691396bf236206b578248..775cb92205c9f2b9a1660a3713d08c14ab5871f9 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -24,6 +24,7 @@
 #include "video_content.h"
 #include "audio_content.h"
 #include "subtitle_content.h"
+#include "audio_mapping.h"
 
 class Filter;
 class ffmpeg_pts_offset_test;
@@ -37,7 +38,9 @@ public:
                , frame_rate (f)
                , channels (c)
                , mapping (c)
-       {}
+       {
+               mapping.make_default ();
+       }
 
        FFmpegAudioStream (boost::shared_ptr<const cxml::Node>);
 
@@ -52,8 +55,11 @@ public:
 
 private:
        friend class ffmpeg_pts_offset_test;
+
        /* Constructor for tests */
-       FFmpegAudioStream () {}
+       FFmpegAudioStream ()
+               : mapping (1)
+       {}
 };
 
 extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
@@ -91,7 +97,6 @@ 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>);
-       FFmpegContent (FFmpegContent const &);
 
        boost::shared_ptr<FFmpegContent> shared_from_this () {
                return boost::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ());
@@ -99,10 +104,10 @@ public:
        
        void examine (boost::shared_ptr<Job>);
        std::string summary () const;
+       std::string technical_summary () const;
        std::string information () const;
        void as_xml (xmlpp::Node *) const;
-       boost::shared_ptr<Content> clone () const;
-       Time length () const;
+       Time full_length () const;
 
        std::string identifier () const;