Move audio bits into AudioContent.

3 files changed, 29 insertions, 15 deletions

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 6fd77a2df..1241b61fb 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -93,7 +93,7 @@ AudioDialog::set_film (shared_ptr<Film> f)
 	_film = f;
 
 	try_to_load_analysis ();
-	_plot->set_gain (_film->audio_gain ());
+//	_plot->set_gain (_film->audio_gain ());
 
 	_film_changed_connection = _film->Changed.connect (bind (&AudioDialog::film_changed, this, _1));
 	_film_audio_analysis_succeeded_connection = _film->AudioAnalysisSucceeded.connect (bind (&AudioDialog::try_to_load_analysis, this));
@@ -145,8 +145,8 @@ void
 AudioDialog::film_changed (Film::Property p)
 {
 	switch (p) {
-	case Film::AUDIO_GAIN:
-		_plot->set_gain (_film->audio_gain ());
+//	case Film::AUDIO_GAIN:
+//		_plot->set_gain (_film->audio_gain ());
 		break;
 	default:
 		break;
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 23dbe19a9..3a1fb232b 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -613,12 +613,6 @@ FilmEditor::film_changed (Film::Property p)
 	case Film::SCALER:
 		checked_set (_scaler, Scaler::as_index (_film->scaler ()));
 		break;
-	case Film::AUDIO_GAIN:
-		checked_set (_audio_gain, _film->audio_gain ());
-		break;
-	case Film::AUDIO_DELAY:
-		checked_set (_audio_delay, _film->audio_delay ());
-		break;
 	case Film::WITH_SUBTITLES:
 		checked_set (_with_subtitles, _film->with_subtitles ());
 		setup_subtitle_control_sensitivity ();
@@ -676,8 +670,10 @@ FilmEditor::film_content_changed (weak_ptr<Content> weak_content, int property)
 
 	shared_ptr<Content> content = weak_content.lock ();
 	shared_ptr<VideoContent> video_content;
+	shared_ptr<AudioContent> audio_content;
 	if (content) {
 		video_content = dynamic_pointer_cast<VideoContent> (content);
+		audio_content = dynamic_pointer_cast<AudioContent> (content);
 	}
 
 	if (property == VideoContentProperty::VIDEO_CROP) {
@@ -686,6 +682,10 @@ FilmEditor::film_content_changed (weak_ptr<Content> weak_content, int property)
 		checked_set (_top_crop,    video_content ? video_content->crop().top :    0);
 		checked_set (_bottom_crop, video_content ? video_content->crop().bottom : 0);
 		setup_scaling_description ();
+	} else if (property == AudioContentProperty::AUDIO_GAIN) {
+		checked_set (_audio_gain, audio_content ? audio_content->audio_gain() : 0);
+	} else if (property == AudioContentProperty::AUDIO_DELAY) {
+		checked_set (_audio_delay, audio_content ? audio_content->audio_delay() : 0);
 	} else if (property == FFmpegContentProperty::SUBTITLE_STREAMS) {
 		setup_subtitle_control_sensitivity ();
 	} else if (property == FFmpegContentProperty::AUDIO_STREAMS) {
@@ -782,8 +782,6 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::CONTAINER);
 	film_changed (Film::FILTERS);
 	film_changed (Film::SCALER);
-	film_changed (Film::AUDIO_GAIN);
-	film_changed (Film::AUDIO_DELAY);
 	film_changed (Film::WITH_SUBTITLES);
 	film_changed (Film::SUBTITLE_OFFSET);
 	film_changed (Film::SUBTITLE_SCALE);
@@ -793,6 +791,8 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::DCP_VIDEO_FRAME_RATE);
 
 	film_content_changed (boost::shared_ptr<Content> (), VideoContentProperty::VIDEO_CROP);
+	film_content_changed (boost::shared_ptr<Content> (), AudioContentProperty::AUDIO_GAIN);
+	film_content_changed (boost::shared_ptr<Content> (), AudioContentProperty::AUDIO_DELAY);
 	film_content_changed (boost::shared_ptr<Content> (), FFmpegContentProperty::SUBTITLE_STREAMS);
 	film_content_changed (boost::shared_ptr<Content> (), FFmpegContentProperty::SUBTITLE_STREAM);
 	film_content_changed (boost::shared_ptr<Content> (), FFmpegContentProperty::AUDIO_STREAMS);
@@ -861,21 +861,23 @@ FilmEditor::scaler_changed (wxCommandEvent &)
 void
 FilmEditor::audio_gain_changed (wxCommandEvent &)
 {
-	if (!_film) {
+	shared_ptr<AudioContent> ac = selected_audio_content ();
+	if (!ac) {
 		return;
 	}
 
-	_film->set_audio_gain (_audio_gain->GetValue ());
+	ac->set_audio_gain (_audio_gain->GetValue ());
 }
 
 void
 FilmEditor::audio_delay_changed (wxCommandEvent &)
 {
-	if (!_film) {
+	shared_ptr<AudioContent> ac = selected_audio_content ();
+	if (!ac) {
 		return;
 	}
 
-	_film->set_audio_delay (_audio_delay->GetValue ());
+	ac->set_audio_delay (_audio_delay->GetValue ());
 }
 
 void
@@ -1137,6 +1139,17 @@ FilmEditor::selected_video_content ()
 	return dynamic_pointer_cast<VideoContent> (c);
 }
 
+shared_ptr<AudioContent>
+FilmEditor::selected_audio_content ()
+{
+	shared_ptr<Content> c = selected_content ();
+	if (!c) {
+		return shared_ptr<AudioContent> ();
+	}
+
+	return dynamic_pointer_cast<AudioContent> (c);
+}
+
 void
 FilmEditor::setup_scaling_description ()
 {
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 3f7264296..ec563cf82 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -112,6 +112,7 @@ private:
 	void active_jobs_changed (bool);
 	boost::shared_ptr<Content> selected_content ();
 	boost::shared_ptr<VideoContent> selected_video_content ();
+	boost::shared_ptr<AudioContent> selected_audio_content ();
 
 	wxNotebook* _main_notebook;
 	wxNotebook* _content_notebook;