X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=82604763c8e690b8e3c884703617794b2e475b6f;hb=c6c082c4a8016f85ba4207f4b8ccee1d5770e4a4;hp=651ea93e10d317e1706c210283a4b5f36b09ef85;hpb=3ddd928233130695d7f4eeee47a71409d8c04de7;p=dcpomatic.git

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 651ea93e1..82604763c 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -20,16 +20,16 @@
 #include <boost/lexical_cast.hpp>
 #include <wx/spinctrl.h>
 #include "lib/config.h"
-#include "lib/sound_processor.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_audio_stream.h"
 #include "lib/audio_processor.h"
+#include "lib/cinema_sound_processor.h"
 #include "audio_dialog.h"
 #include "audio_panel.h"
 #include "audio_mapping_view.h"
 #include "wx_util.h"
 #include "gain_calculator_dialog.h"
-#include "film_editor.h"
+#include "content_panel.h"
 
 using std::vector;
 using std::cout;
@@ -83,14 +83,13 @@ AudioPanel::AudioPanel (ContentPanel* p)
 
 	add_label_to_grid_bag_sizer (grid, this, _("Stream"), true, wxGBPosition (r, 0));
 	_stream = new wxChoice (this, wxID_ANY);
-	grid->Add (_stream, wxGBPosition (r, 1));
-	_description = add_label_to_grid_bag_sizer (grid, this, "", false, wxGBPosition (r, 3));
+	grid->Add (_stream, wxGBPosition (r, 1), wxGBSpan (1, 3), wxEXPAND);
 	++r;
 
 	add_label_to_grid_bag_sizer (grid, this, _("Process with"), true, wxGBPosition (r, 0));
 	_processor = new wxChoice (this, wxID_ANY);
 	setup_processors ();
-	grid->Add (_processor, wxGBPosition (r, 1));
+	grid->Add (_processor, wxGBPosition (r, 1), wxGBSpan (1, 3), wxEXPAND);
 	++r;
 	
 	_mapping = new AudioMappingView (this);
@@ -138,7 +137,6 @@ AudioPanel::film_content_changed (int property)
 		_mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
 		_sizer->Layout ();
 	} else if (property == FFmpegContentProperty::AUDIO_STREAM) {
-		setup_stream_description ();
 		_mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
 		_sizer->Layout ();
 	} else if (property == FFmpegContentProperty::AUDIO_STREAMS) {
@@ -151,7 +149,6 @@ AudioPanel::film_content_changed (int property)
 			
 			if (fcs->audio_stream()) {
 				checked_set (_stream, fcs->audio_stream()->identifier ());
-				setup_stream_description ();
 			}
 		}
 	} else if (property == AudioContentProperty::AUDIO_PROCESSOR) {
@@ -175,7 +172,7 @@ AudioPanel::gain_calculate_button_clicked ()
 	}
 	
 	_gain->wrapped()->SetValue (
-		Config::instance()->sound_processor()->db_for_fader_change (
+		Config::instance()->cinema_sound_processor()->db_for_fader_change (
 			d->wanted_fader (),
 			d->actual_fader ()
 			)
@@ -231,33 +228,6 @@ AudioPanel::stream_changed ()
 	if (i != a.end ()) {
 		fcs->set_audio_stream (*i);
 	}
-
-	setup_stream_description ();
-}
-
-void
-AudioPanel::setup_stream_description ()
-{
-	FFmpegContentList fc = _parent->selected_ffmpeg ();
-	if (fc.size() != 1) {
-		_description->SetLabel ("");
-		return;
-	}
-
-	shared_ptr<FFmpegContent> fcs = fc.front ();
-
-	if (!fcs->audio_stream ()) {
-		_description->SetLabel (wxT (""));
-	} else {
-		wxString s;
-		if (fcs->audio_channels() == 1) {
-			s << _("1 channel");
-		} else {
-			s << fcs->audio_channels() << wxT (" ") << _("channels");
-		}
-		s << wxT (", ") << fcs->audio_frame_rate() << _("Hz");
-		_description->SetLabel (s);
-	}
 }
 
 void