X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=8b2682762c4984fbfcd83e03958481eb07982767;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=4d783ca9da71b9e6f5ec69c2b87fb7afaf8ee6e2;hpb=6f0a590bc3266f21ba577116219bd019e891d480;p=dcpomatic.git

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 4d783ca9d..8b2682762 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -19,8 +19,6 @@
 
 #include "lib/config.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"
@@ -83,17 +81,6 @@ AudioPanel::AudioPanel (ContentPanel* p)
 	add_label_to_grid_bag_sizer (grid, this, _("ms"), false, wxGBPosition (r, 2));
 	++r;
 
-	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), 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), wxGBSpan (1, 3), wxEXPAND);
-	++r;
-	
 	_mapping = new AudioMappingView (this);
 	_sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6);
 	++r;
@@ -111,10 +98,8 @@ AudioPanel::AudioPanel (ContentPanel* p)
 	_gain->wrapped()->SetIncrement (0.5);
 	_delay->wrapped()->SetRange (-1000, 1000);
 
-	_stream->Bind                (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&AudioPanel::stream_changed, 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));
-	_processor->Bind             (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&AudioPanel::processor_changed, this));
 
 	_mapping_connection = _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1));
 }
@@ -147,34 +132,10 @@ AudioPanel::film_content_changed (int property)
 		fcs = dynamic_pointer_cast<FFmpegContent> (acs);
 	}
 	
-	if (property == AudioContentProperty::AUDIO_MAPPING) {
+	if (property == AudioContentProperty::AUDIO_STREAMS) {
 		_mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
 		_sizer->Layout ();
-	} else if (property == AudioContentProperty::AUDIO_FRAME_RATE) {
 		setup_description ();
-	} else if (property == FFmpegContentProperty::AUDIO_STREAM) {
-		_mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
-		_sizer->Layout ();
-	} else if (property == FFmpegContentProperty::AUDIO_STREAMS) {
-		if (fcs) {
-			vector<pair<string, string> > data;
-			BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, fcs->audio_streams ()) {
-				data.push_back (make_pair (i->name, i->identifier ()));
-			}
-			checked_set (_stream, data);
-			
-			if (fcs->audio_stream()) {
-				checked_set (_stream, fcs->audio_stream()->identifier ());
-			}
-		} else {
-			_stream->Clear ();
-		}
-	} else if (property == AudioContentProperty::AUDIO_PROCESSOR) {
-		if (acs) {
-			checked_set (_processor, acs->audio_processor() ? acs->audio_processor()->id() : N_("none"));
-		} else {
-			checked_set (_processor, N_("none"));
-		}
 	}
 }
 
@@ -222,47 +183,6 @@ AudioPanel::show_clicked ()
 	_audio_dialog->set_content (ac.front ());
 }
 
-void
-AudioPanel::stream_changed ()
-{
-	FFmpegContentList fc = _parent->selected_ffmpeg ();
-	if (fc.size() != 1) {
-		return;
-	}
-
-	shared_ptr<FFmpegContent> fcs = fc.front ();
-	
-	if (_stream->GetSelection() == -1) {
-		return;
-	}
-	
-	vector<shared_ptr<FFmpegAudioStream> > a = fcs->audio_streams ();
-	vector<shared_ptr<FFmpegAudioStream> >::iterator i = a.begin ();
-	string const s = string_client_data (_stream->GetClientObject (_stream->GetSelection ()));
-	while (i != a.end() && (*i)->identifier () != s) {
-		++i;
-	}
-
-	if (i != a.end ()) {
-		fcs->set_audio_stream (*i);
-	}
-}
-
-void
-AudioPanel::processor_changed ()
-{
-	string const s = string_client_data (_processor->GetClientObject (_processor->GetSelection ()));
-	AudioProcessor const * p = 0;
-	if (s != wx_to_std (N_("none"))) {
-		p = AudioProcessor::from_id (s);
-	}
-		
-	AudioContentList c = _parent->selected_audio ();
-	for (AudioContentList::const_iterator i = c.begin(); i != c.end(); ++i) {
-		(*i)->set_audio_processor (p);
-	}
-}
-
 void
 AudioPanel::setup_description ()
 {
@@ -298,36 +218,7 @@ AudioPanel::content_selection_changed ()
 
 	_gain_calculate_button->Enable (sel.size() == 1);
 	_show->Enable (sel.size() == 1);
-	_stream->Enable (sel.size() == 1);
-	_processor->Enable (!sel.empty());
 	_mapping->Enable (sel.size() == 1);
 
-	setup_processors ();
-
-	film_content_changed (AudioContentProperty::AUDIO_MAPPING);
-	film_content_changed (AudioContentProperty::AUDIO_PROCESSOR);
-	film_content_changed (AudioContentProperty::AUDIO_FRAME_RATE);
-	film_content_changed (FFmpegContentProperty::AUDIO_STREAM);
 	film_content_changed (FFmpegContentProperty::AUDIO_STREAMS);
 }
-
-void
-AudioPanel::setup_processors ()
-{
-	AudioContentList sel = _parent->selected_audio ();
-
-	_processor->Clear ();
-	list<AudioProcessor const *> ap = AudioProcessor::all ();
-	_processor->Append (_("None"), new wxStringClientData (N_("none")));
-	for (list<AudioProcessor const *>::const_iterator i = ap.begin(); i != ap.end(); ++i) {
-
-		AudioContentList::const_iterator j = sel.begin();
-		while (j != sel.end() && (*i)->in_channels().includes ((*j)->audio_channels ())) {
-			++j;
-		}
-
-		if (j == sel.end ()) {
-			_processor->Append (std_to_wx ((*i)->name ()), new wxStringClientData (std_to_wx ((*i)->id ())));
-		}
-	}
-}