Modify previous commit to move restriction code into the UI.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index a1daebe783f854d5e422a44bbc6dad47985cd0f2..96a79f9cf5abfd6179922da03e376e0a2aac472c 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -223,7 +223,9 @@ public:
                return _video_frame_rate;
        }
 
-       int audio_channels () const;
+       int audio_channels () const {
+               return _audio_channels;
+       }
 
        bool three_d () const {
                return _three_d;
@@ -324,9 +326,7 @@ private:
        int _video_frame_rate;
        /** The date that we should use in a ISDCF name */
        boost::gregorian::date _isdcf_date;
-       /** Number of audio channels requested for the DCP; this will be overridden
-           if we are using an audio processor which outputs more channels.
-       */
+       /** Number of audio channels requested for the DCP */
        int _audio_channels;
        /** If true, the DCP will be written in 3D mode; otherwise in 2D.
            This will be regardless of what content is on the playlist.