using boost::shared_ptr;
using boost::bind;
+using boost::optional;
AudioDialog::AudioDialog (wxWindow* parent)
: wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
_plot = new AudioPlot (this);
- sizer->Add (_plot, 1);
+ sizer->Add (_plot, 1, wxALL | wxEXPAND, 12);
- wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
+ wxBoxSizer* side = new wxBoxSizer (wxVERTICAL);
- add_label_to_sizer (table, this, _("Channel"));
- _channel = new wxChoice (this, wxID_ANY);
- table->Add (_channel, 1, wxEXPAND | wxALL, 6);
+ {
+ wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Channels"));
+ side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+ }
+
+
+ for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
+ _channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i)));
+ side->Add (_channel_checkbox[i], 1, wxEXPAND | wxALL, 3);
+ _channel_checkbox[i]->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (AudioDialog::channel_clicked), 0, this);
+ }
+
+ {
+ wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Type"));
+ side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+ }
+
+ wxString const types[] = {
+ _("Peak"),
+ _("RMS")
+ };
+
+ for (int i = 0; i < AudioPoint::COUNT; ++i) {
+ _type_checkbox[i] = new wxCheckBox (this, wxID_ANY, types[i]);
+ side->Add (_type_checkbox[i], 1, wxEXPAND | wxALL, 3);
+ _type_checkbox[i]->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (AudioDialog::type_clicked), 0, this);
+ }
+
+ {
+ wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Smoothing"));
+ side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+ }
+
+ _smoothing = new wxSlider (this, wxID_ANY, AudioPlot::max_smoothing / 2, 1, AudioPlot::max_smoothing);
+ _smoothing->Connect (wxID_ANY, wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler (AudioDialog::smoothing_changed), 0, this);
+ side->Add (_smoothing, 1, wxEXPAND);
- sizer->Add (table);
+ sizer->Add (side, 0, wxALL, 12);
SetSizer (sizer);
sizer->Layout ();
sizer->SetSizeHints (this);
-
- _channel->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (AudioDialog::channel_changed), 0, this);
}
void
AudioDialog::set_film (boost::shared_ptr<Film> f)
{
_film_changed_connection.disconnect ();
- _film_audio_analysis_finished_connection.disconnect ();
+ _film_audio_analysis_succeeded_connection.disconnect ();
_film = f;
try_to_load_analysis ();
setup_channels ();
-
- _channel->SetSelection (0);
+ _plot->set_gain (_film->audio_gain ());
_film_changed_connection = _film->Changed.connect (bind (&AudioDialog::film_changed, this, _1));
- _film_audio_analysis_finished_connection = _film->AudioAnalysisFinished.connect (bind (&AudioDialog::try_to_load_analysis, this));
+ _film_audio_analysis_succeeded_connection = _film->AudioAnalysisSucceeded.connect (bind (&AudioDialog::try_to_load_analysis, this));
+
+ SetTitle (wxString::Format (_("DVD-o-matic audio - %s"), std_to_wx(_film->name()).data()));
}
void
AudioDialog::setup_channels ()
{
- _channel->Clear ();
-
if (!_film->audio_stream()) {
return;
}
+
+ AudioMapping m (_film->audio_stream()->channels ());
- for (int i = 0; i < _film->audio_stream()->channels(); ++i) {
- _channel->Append (audio_channel_name (i));
+ for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
+ if (m.dcp_to_source(static_cast<libdcp::Channel>(i))) {
+ _channel_checkbox[i]->Show ();
+ } else {
+ _channel_checkbox[i]->Hide ();
+ }
}
}
}
_plot->set_analysis (a);
+
+ AudioMapping m (_film->audio_stream()->channels ());
+ optional<libdcp::Channel> c = m.source_to_dcp (0);
+ if (c) {
+ _channel_checkbox[c.get()]->SetValue (true);
+ _plot->set_channel_visible (0, true);
+ }
+
+ for (int i = 0; i < AudioPoint::COUNT; ++i) {
+ _type_checkbox[i]->SetValue (true);
+ _plot->set_type_visible (i, true);
+ }
}
void
-AudioDialog::channel_changed (wxCommandEvent &)
+AudioDialog::channel_clicked (wxCommandEvent& ev)
{
- _plot->set_channel (_channel->GetSelection ());
+ int c = 0;
+ while (c < MAX_AUDIO_CHANNELS && ev.GetEventObject() != _channel_checkbox[c]) {
+ ++c;
+ }
+
+ assert (c < MAX_AUDIO_CHANNELS);
+
+ AudioMapping m (_film->audio_stream()->channels ());
+ optional<int> s = m.dcp_to_source (static_cast<libdcp::Channel> (c));
+ if (s) {
+ _plot->set_channel_visible (s.get(), _channel_checkbox[c]->GetValue ());
+ }
}
void
break;
}
}
+
+void
+AudioDialog::type_clicked (wxCommandEvent& ev)
+{
+ int t = 0;
+ while (t < AudioPoint::COUNT && ev.GetEventObject() != _type_checkbox[t]) {
+ ++t;
+ }
+
+ assert (t < AudioPoint::COUNT);
+
+ _plot->set_type_visible (t, _type_checkbox[t]->GetValue ());
+}
+
+void
+AudioDialog::smoothing_changed (wxScrollEvent &)
+{
+ _plot->set_smoothing (_smoothing->GetValue ());
+}