X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=cef82f9ffcf1ae9fadacc4e7233bd630048afdbf;hb=ad5c8849fc3ef5aad88201f28db5474a60db4436;hp=dad1981f44c9d3cc2927af12fa962ce4e0d6a234;hpb=19f94521139aac13ef8fb4eaa55855b2ada307b4;p=dcpomatic.git

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index dad1981f4..cef82f9ff 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -24,6 +25,7 @@
 #include "content_panel.h"
 #include "audio_dialog.h"
 #include "lib/config.h"
+#include "lib/ffmpeg_audio_stream.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/cinema_sound_processor.h"
 #include "lib/job_manager.h"
@@ -109,9 +111,9 @@ AudioPanel::AudioPanel (ContentPanel* p)
 	_gain->wrapped()->SetIncrement (0.5);
 	_delay->wrapped()->SetRange (-1000, 1000);
 
-	_reference->Bind             (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioPanel::reference_clicked, this));
-	_show->Bind                  (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&AudioPanel::show_clicked, this));
-	_gain_calculate_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&AudioPanel::gain_calculate_button_clicked, this));
+	_reference->Bind             (wxEVT_CHECKBOX, boost::bind (&AudioPanel::reference_clicked, this));
+	_show->Bind                  (wxEVT_BUTTON,   boost::bind (&AudioPanel::show_clicked, this));
+	_gain_calculate_button->Bind (wxEVT_BUTTON,   boost::bind (&AudioPanel::gain_calculate_button_clicked, this));
 
 	_mapping_connection = _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1));
 
@@ -139,7 +141,9 @@ AudioPanel::film_changed (Film::Property property)
 		setup_description ();
 		break;
 	case Film::REEL_TYPE:
+	case Film::INTEROP:
 		setup_sensitivity ();
+		break;
 	default:
 		break;
 	}
@@ -153,6 +157,23 @@ AudioPanel::film_content_changed (int property)
 		if (ac.size() == 1) {
 			_mapping->set (ac.front()->audio->mapping());
 			_mapping->set_input_channels (ac.front()->audio->channel_names ());
+
+			vector<AudioMappingView::Group> groups;
+			int c = 0;
+			BOOST_FOREACH (shared_ptr<const AudioStream> i, ac.front()->audio->streams()) {
+				shared_ptr<const FFmpegAudioStream> f = dynamic_pointer_cast<const FFmpegAudioStream> (i);
+				string name = "";
+				if (f) {
+					name = f->name;
+					if (f->codec_name) {
+						name += " (" + f->codec_name.get() + ")";
+					}
+				}
+				groups.push_back (AudioMappingView::Group (c, c + i->channels() - 1, name));
+				c += i->channels ();
+			}
+			_mapping->set_input_groups (groups);
+
 		} else {
 			_mapping->set (AudioMapping ());
 		}
@@ -253,17 +274,19 @@ AudioPanel::setup_sensitivity ()
 	if (_reference->GetValue ()) {
 		_gain->wrapped()->Enable (false);
 		_gain_calculate_button->Enable (false);
+		_show->Enable (true);
 		_peak->Enable (false);
 		_delay->wrapped()->Enable (false);
 		_mapping->Enable (false);
 		_description->Enable (false);
 	} else {
-		_gain->wrapped()->Enable (true);
+		_gain->wrapped()->Enable (sel.size() == 1);
 		_gain_calculate_button->Enable (sel.size() == 1);
-		_peak->Enable (true);
-		_delay->wrapped()->Enable (true);
+		_show->Enable (sel.size() == 1);
+		_peak->Enable (sel.size() == 1);
+		_delay->wrapped()->Enable (sel.size() == 1);
 		_mapping->Enable (sel.size() == 1);
-		_description->Enable (true);
+		_description->Enable (sel.size() == 1);
 	}
 }
 
@@ -297,15 +320,11 @@ AudioPanel::setup_peak ()
 		playlist->add (sel.front ());
 		try {
 			shared_ptr<AudioAnalysis> analysis (new AudioAnalysis (_parent->film()->audio_analysis_path (playlist)));
-			if (analysis->sample_peak ()) {
-				float const peak_dB = 20 * log10 (analysis->sample_peak().get()) + analysis->gain_correction (playlist);
-				if (peak_dB > -3) {
-					alert = true;
-				}
-				_peak->SetLabel (wxString::Format (_("Peak: %.2fdB"), peak_dB));
-			} else {
-				_peak->SetLabel (_("Peak: unknown"));
+			float const peak_dB = 20 * log10 (analysis->overall_sample_peak().first.peak) + analysis->gain_correction (playlist);
+			if (peak_dB > -3) {
+				alert = true;
 			}
+			_peak->SetLabel (wxString::Format (_("Peak: %.2fdB"), peak_dB));
 		} catch (...) {
 			_peak->SetLabel (_("Peak: unknown"));
 		}
@@ -343,3 +362,13 @@ AudioPanel::reference_clicked ()
 
 	d->set_reference_audio (_reference->GetValue ());
 }
+
+void
+AudioPanel::set_film (shared_ptr<Film>)
+{
+	/* We are changing film, so destroy any audio dialog for the old one */
+	if (_audio_dialog) {
+		_audio_dialog->Destroy ();
+		_audio_dialog = 0;
+	}
+}