Modify previous commit to move restriction code into the UI.

2 files changed, 4 insertions, 19 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 98b921029..66d651c27 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1232,18 +1232,3 @@ Film::audio_output_names () const
 
 	return vector<string> (n.begin(), n.begin() + audio_channels ());
 }
-
-int
-Film::audio_channels () const
-{
-	int minimum = 0;
-	if (_audio_processor) {
-		minimum = _audio_processor->out_channels ();
-	}
-
-	if (minimum % 2 == 1) {
-		++minimum;
-	}
-
-	return max (minimum, _audio_channels);
-}
diff --git a/src/lib/film.h b/src/lib/film.h
index a1daebe78..96a79f9cf 100644
--- 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.