X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=6ac673f4d246641326cf1b60a8c6ea2acb90d845;hb=0e164ad80f0ceff9d643f3b466690d013c3be19d;hp=f29704b548b197d5c82cf318275d2c85bd0bda26;hpb=0241df1707c7ea5658f471828ff6dc944e21af42;p=dcpomatic.git

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index f29704b54..6ac673f4d 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -18,41 +18,54 @@
 
 */
 
-#include "audio_panel.h"
-#include "audio_mapping_view.h"
-#include "wx_util.h"
-#include "gain_calculator_dialog.h"
-#include "content_panel.h"
+
 #include "audio_dialog.h"
-#include "static_text.h"
+#include "audio_mapping_view.h"
+#include "audio_panel.h"
 #include "check_box.h"
+#include "content_panel.h"
 #include "dcpomatic_button.h"
+#include "gain_calculator_dialog.h"
+#include "static_text.h"
+#include "wx_util.h"
+#include "lib/audio_content.h"
+#include "lib/cinema_sound_processor.h"
 #include "lib/config.h"
+#include "lib/dcp_content.h"
 #include "lib/ffmpeg_audio_stream.h"
 #include "lib/ffmpeg_content.h"
-#include "lib/cinema_sound_processor.h"
 #include "lib/job_manager.h"
-#include "lib/dcp_content.h"
-#include "lib/audio_content.h"
+#include "lib/maths_util.h"
 #include <wx/spinctrl.h>
 #include <iostream>
 
-using std::vector;
+
 using std::cout;
-using std::string;
+using std::dynamic_pointer_cast;
 using std::list;
-using std::pair;
 using std::make_shared;
-using std::dynamic_pointer_cast;
+using std::pair;
+using std::set;
 using std::shared_ptr;
+using std::string;
+using std::vector;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
+using namespace dcpomatic;
+
 
 AudioPanel::AudioPanel (ContentPanel* p)
 	: ContentSubPanel (p, _("Audio"))
 	, _audio_dialog (0)
+{
+
+}
+
+
+void
+AudioPanel::create ()
 {
 	_reference = new CheckBox (this, _("Use this DCP's audio as OV and make VF"));
 	_reference_note = new StaticText (this, wxT(""));
@@ -91,6 +104,12 @@ AudioPanel::AudioPanel (ContentPanel* p)
 	/// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
 	_delay_ms_label = create_label (this, _("ms"), false);
 
+	_fade_in_label = create_label (this, _("Fade in"), true);
+	_fade_in = new Timecode<ContentTime> (this);
+
+	_fade_out_label = create_label (this, _("Fade out"), true);
+	_fade_out = new Timecode<ContentTime> (this);
+
 	_mapping = new AudioMappingView (this, _("Content"), _("content"), _("DCP"), _("DCP"));
 	_sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6);
 
@@ -104,20 +123,26 @@ AudioPanel::AudioPanel (ContentPanel* p)
 	_delay->wrapped()->SetRange (-1000, 1000);
 
 	content_selection_changed ();
-	film_changed (Film::AUDIO_CHANNELS);
-	film_changed (Film::VIDEO_FRAME_RATE);
-	film_changed (Film::REEL_TYPE);
+	film_changed (Film::Property::AUDIO_CHANNELS);
+	film_changed (Film::Property::VIDEO_FRAME_RATE);
+	film_changed (Film::Property::REEL_TYPE);
 
 	_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));
 
+	_fade_in->Changed.connect (boost::bind(&AudioPanel::fade_in_changed, this));
+	_fade_out->Changed.connect (boost::bind(&AudioPanel::fade_out_changed, this));
+
 	_mapping_connection = _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1));
 	_active_jobs_connection = JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1, _2));
 
 	add_to_grid ();
+
+	_sizer->Layout ();
 }
 
+
 void
 AudioPanel::add_to_grid ()
 {
@@ -136,7 +161,7 @@ AudioPanel::add_to_grid ()
 	add_label_to_sizer (_grid, _gain_label, true, wxGBPosition(r, 0));
 	{
 		auto s = new wxBoxSizer (wxHORIZONTAL);
-		s->Add (_gain->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+		s->Add (_gain->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_GAP);
 		s->Add (_gain_db_label, 0, wxALIGN_CENTER_VERTICAL);
 		_grid->Add (s, wxGBPosition(r, 1));
 	}
@@ -146,12 +171,21 @@ AudioPanel::add_to_grid ()
 
 	add_label_to_sizer (_grid, _delay_label, true, wxGBPosition(r, 0));
 	auto s = new wxBoxSizer (wxHORIZONTAL);
-	s->Add (_delay->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+	s->Add (_delay->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_GAP);
 	s->Add (_delay_ms_label, 0, wxALIGN_CENTER_VERTICAL);
 	_grid->Add (s, wxGBPosition(r, 1));
 	++r;
+
+	add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition(r, 0));
+	_grid->Add (_fade_in, wxGBPosition(r, 1), wxGBSpan(1, 3));
+	++r;
+
+	add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition(r, 0));
+	_grid->Add (_fade_out, wxGBPosition(r, 1), wxGBSpan(1, 3));
+	++r;
 }
 
+
 AudioPanel::~AudioPanel ()
 {
 	if (_audio_dialog) {
@@ -168,16 +202,16 @@ AudioPanel::film_changed (Film::Property property)
 	}
 
 	switch (property) {
-	case Film::AUDIO_CHANNELS:
-	case Film::AUDIO_PROCESSOR:
+	case Film::Property::AUDIO_CHANNELS:
+	case Film::Property::AUDIO_PROCESSOR:
 		_mapping->set_output_channels (_parent->film()->audio_output_names ());
 		setup_peak ();
 		break;
-	case Film::VIDEO_FRAME_RATE:
+	case Film::Property::VIDEO_FRAME_RATE:
 		setup_description ();
 		break;
-	case Film::REEL_TYPE:
-	case Film::INTEROP:
+	case Film::Property::REEL_TYPE:
+	case Film::Property::INTEROP:
 		setup_sensitivity ();
 		break;
 	default:
@@ -215,7 +249,7 @@ AudioPanel::film_content_changed (int property)
 		}
 		setup_description ();
 		setup_peak ();
-		_sizer->Layout ();
+		layout ();
 	} else if (property == AudioContentProperty::GAIN) {
 		setup_peak ();
 	} else if (property == DCPContentProperty::REFERENCE_AUDIO) {
@@ -229,6 +263,34 @@ AudioPanel::film_content_changed (int property)
 		setup_sensitivity ();
 	} else if (property == ContentProperty::VIDEO_FRAME_RATE) {
 		setup_description ();
+	} else if (property == AudioContentProperty::FADE_IN) {
+		set<Frame> check;
+		for (auto i: ac) {
+			check.insert (i->audio->fade_in().get());
+		}
+
+		if (check.size() == 1) {
+			_fade_in->set (
+				ac.front()->audio->fade_in(),
+				ac.front()->active_video_frame_rate(_parent->film())
+				);
+		} else {
+			_fade_in->clear ();
+		}
+	} else if (property == AudioContentProperty::FADE_OUT) {
+		set<Frame> check;
+		for (auto i: ac) {
+			check.insert (i->audio->fade_out().get());
+		}
+
+		if (check.size() == 1) {
+			_fade_out->set (
+				ac.front()->audio->fade_out(),
+				ac.front()->active_video_frame_rate(_parent->film())
+				);
+		} else {
+			_fade_out->clear ();
+		}
 	}
 }
 
@@ -294,6 +356,8 @@ AudioPanel::content_selection_changed ()
 
 	film_content_changed (AudioContentProperty::STREAMS);
 	film_content_changed (AudioContentProperty::GAIN);
+	film_content_changed (AudioContentProperty::FADE_IN);
+	film_content_changed (AudioContentProperty::FADE_OUT);
 	film_content_changed (DCPContentProperty::REFERENCE_AUDIO);
 
 	setup_sensitivity ();
@@ -319,23 +383,16 @@ AudioPanel::setup_sensitivity ()
 	}
 	setup_refer_button (_reference, _reference_note, dcp, can_reference, cannot);
 
-	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 (sel.size() == 1);
-		_gain_calculate_button->Enable (sel.size() == 1);
-		_show->Enable (sel.size() == 1);
-		_peak->Enable (sel.size() == 1);
-		_delay->wrapped()->Enable (sel.size() == 1);
-		_mapping->Enable (sel.size() == 1);
-		_description->Enable (sel.size() == 1);
-	}
+	auto const ref = _reference->GetValue();
+	auto const single = sel.size() == 1;
+
+	_gain->wrapped()->Enable (!ref);
+	_gain_calculate_button->Enable (!ref && single);
+	_show->Enable (single);
+	_peak->Enable (!ref && single);
+	_delay->wrapped()->Enable (!ref);
+	_mapping->Enable (!ref && single);
+	_description->Enable (!ref && single);
 }
 
 void
@@ -440,3 +497,26 @@ AudioPanel::set_film (shared_ptr<Film>)
 		_audio_dialog = nullptr;
 	}
 }
+
+
+void
+AudioPanel::fade_in_changed ()
+{
+	auto const hmsf = _fade_in->get();
+	for (auto i: _parent->selected_audio()) {
+		auto const vfr = i->active_video_frame_rate(_parent->film());
+		i->audio->set_fade_in (dcpomatic::ContentTime(hmsf, vfr));
+	}
+}
+
+
+void
+AudioPanel::fade_out_changed ()
+{
+	auto const hmsf = _fade_out->get();
+	for (auto i: _parent->selected_audio()) {
+		auto const vfr = i->active_video_frame_rate (_parent->film());
+		i->audio->set_fade_out (dcpomatic::ContentTime(hmsf, vfr));
+	}
+}
+