Merge master.

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

diff --git a/src/lib/null_content.h b/src/lib/null_content.h
index d4a3b7371ed8514b75372cc08626784939686b71..889ff7a0d326990a59e2d90af62138ad4c24231f 100644 (file)
--- a/src/lib/null_content.h
+++ b/src/lib/null_content.h
@@ -41,9 +41,7 @@ public:
                return boost::shared_ptr<Content> ();
        }
 
-        int audio_channels () const {
-               return MAX_AUDIO_CHANNELS;
-       }
+        int audio_channels () const;
        
         ContentAudioFrame audio_length () const {
                return _audio_length;
@@ -56,6 +54,8 @@ public:
        AudioMapping audio_mapping () const {
                return AudioMapping ();
        }
+
+       void set_audio_mapping (AudioMapping) {}
        
        Time length () const {
                return _length;