_dcp_audio_channels is trying to do the same thing as _minimum_audio_channels (but...

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 496915d13c8853bb5f328765c31517946a5b6106..11fa879129f1b399d65348645bc4e0961b298c56 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -101,7 +101,6 @@ Film::Film (string d)
        , _dci_metadata (Config::instance()->default_dci_metadata ())
        , _dcp_video_frame_rate (24)
        , _dcp_audio_channels (MAX_AUDIO_CHANNELS)
-       , _minimum_audio_channels (0)
        , _dirty (false)
 {
        set_dci_date_today ();
@@ -150,7 +149,6 @@ Film::Film (Film const & o)
        , _dci_metadata      (o._dci_metadata)
        , _dcp_video_frame_rate (o._dcp_video_frame_rate)
        , _dci_date          (o._dci_date)
-       , _minimum_audio_channels (o._minimum_audio_channels)
        , _dirty             (o._dirty)
 {
        _playlist->ContentChanged.connect (bind (&Film::playlist_content_changed, this, _1, _2));
@@ -358,7 +356,6 @@ Film::write_metadata () const
        root->add_child("DCPVideoFrameRate")->add_child_text (lexical_cast<string> (_dcp_video_frame_rate));
        root->add_child("DCIDate")->add_child_text (boost::gregorian::to_iso_string (_dci_date));
        root->add_child("DCPAudioChannels")->add_child_text (lexical_cast<string> (_dcp_audio_channels));
-       root->add_child("MinimumAudioChannels")->add_child_text (lexical_cast<string> (_minimum_audio_channels));
        _playlist->as_xml (root->add_child ("Playlist"));
 
        doc.write_to_file_formatted (file ("metadata.xml"));
@@ -406,7 +403,6 @@ Film::read_metadata ()
        _dcp_video_frame_rate = f.number_child<int> ("DCPVideoFrameRate");
        _dci_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate"));
        _dcp_audio_channels = f.number_child<int> ("DCPAudioChannels");
-       _minimum_audio_channels = f.number_child<int> ("MinimumAudioChannels");
 
        _playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"));
 
@@ -647,17 +643,6 @@ Film::set_dci_metadata (DCIMetadata m)
        signal_changed (DCI_METADATA);
 }
 
-
-void
-Film::set_minimum_audio_channels (int c)
-{
-       {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               _minimum_audio_channels = c;
-       }
-       signal_changed (MINIMUM_AUDIO_CHANNELS);
-}
-                       
 void
 Film::set_dcp_video_frame_rate (int f)
 {

diff --git a/src/lib/film.h b/src/lib/film.h
index f5a7c1246c38c2f133f8d82044be6531b26662f8..5bb9acf297be8091ef7db70934eed336aa657c39 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -141,7 +141,6 @@ public:
                J2K_BANDWIDTH,
                DCI_METADATA,
                DCP_VIDEO_FRAME_RATE,
-               MINIMUM_AUDIO_CHANNELS
        };
 
 
@@ -218,11 +217,6 @@ public:
                return _dcp_audio_channels;
        }
 
-       int minimum_audio_channels () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _minimum_audio_channels;
-       }
-
        /* SET */
 
        void set_directory (std::string);
@@ -242,7 +236,6 @@ public:
        void set_dci_metadata (DCIMetadata);
        void set_dcp_video_frame_rate (int);
        void set_dci_date_today ();
-       void set_minimum_audio_channels (int);
 
        /** Emitted when some property has of the Film has changed */
        mutable boost::signals2::signal<void (Property)> Changed;
@@ -305,7 +298,6 @@ private:
        /** The date that we should use in a DCI name */
        boost::gregorian::date _dci_date;
        int _dcp_audio_channels;
-       int _minimum_audio_channels;
 
        /** true if our state has changed since we last saved it */
        mutable bool _dirty;