*/
#include <boost/filesystem.hpp>
+#include "lib/audio_analysis.h"
+#include "lib/film.h"
+#include "lib/audio_content.h"
#include "audio_dialog.h"
#include "audio_plot.h"
-#include "audio_analysis.h"
-#include "film.h"
#include "wx_util.h"
using boost::shared_ptr;
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) {
+ for (int i = 0; i < MAX_DCP_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);
+ _channel_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::channel_clicked, this, _1));
}
{
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);
+ _type_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::type_clicked, this, _1));
}
{
}
_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);
+ _smoothing->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind (&AudioDialog::smoothing_changed, this));
side->Add (_smoothing, 1, wxEXPAND);
sizer->Add (side, 0, wxALL, 12);
}
void
-AudioDialog::set_film (boost::shared_ptr<Film> f)
+AudioDialog::set_content (shared_ptr<AudioContent> c)
{
- _film_changed_connection.disconnect ();
- _film_audio_analysis_succeeded_connection.disconnect ();
-
- _film = f;
+ _content_changed_connection.disconnect ();
+
+ _content = c;
try_to_load_analysis ();
- setup_channels ();
- _plot->set_gain (_film->audio_gain ());
+ _plot->set_gain (_content->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));
+ _content_changed_connection = _content->Changed.connect (bind (&AudioDialog::content_changed, this, _2));
- SetTitle (wxString::Format (_("DVD-o-matic audio - %s"), std_to_wx(_film->name()).data()));
+ SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_content->path_summary()).data()));
}
void
-AudioDialog::setup_channels ()
+AudioDialog::try_to_load_analysis ()
{
- if (!_film->audio_stream()) {
+ if (!IsShown ()) {
return;
}
- AudioMapping m (_film->audio_stream()->channels ());
-
- 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 ();
- }
+ if (!boost::filesystem::exists (_content->audio_analysis_path())) {
+ _analysis_finished_connection = _content->analyse_audio (bind (&AudioDialog::analysis_finished, this));
+ return;
}
-}
-
-void
-AudioDialog::try_to_load_analysis ()
-{
+
shared_ptr<AudioAnalysis> a;
-
- if (boost::filesystem::exists (_film->audio_analysis_path())) {
- a.reset (new AudioAnalysis (_film->audio_analysis_path ()));
- } else {
- if (IsShown ()) {
- _film->analyse_audio ();
- }
- }
-
+
+ a.reset (new AudioAnalysis (_content->audio_analysis_path ()));
_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);
+ if (_channel_checkbox[0]) {
+ _channel_checkbox[0]->SetValue (true);
}
+ _plot->set_channel_visible (0, true);
for (int i = 0; i < AudioPoint::COUNT; ++i) {
_type_checkbox[i]->SetValue (true);
}
}
+void
+AudioDialog::analysis_finished ()
+{
+ if (!boost::filesystem::exists (_content->audio_analysis_path())) {
+ /* We analysed and still nothing showed up, so maybe it was cancelled or it failed.
+ Give up.
+ */
+ _plot->set_message (_("Could not analyse audio."));
+ return;
+ }
+
+ try_to_load_analysis ();
+}
+
void
AudioDialog::channel_clicked (wxCommandEvent& ev)
{
int c = 0;
- while (c < MAX_AUDIO_CHANNELS && ev.GetEventObject() != _channel_checkbox[c]) {
+ while (c < MAX_DCP_AUDIO_CHANNELS && ev.GetEventObject() != _channel_checkbox[c]) {
++c;
}
- assert (c < MAX_AUDIO_CHANNELS);
+ assert (c < MAX_DCP_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 ());
- }
+ _plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ());
}
void
-AudioDialog::film_changed (Film::Property p)
+AudioDialog::content_changed (int p)
{
- switch (p) {
- case Film::AUDIO_GAIN:
- _plot->set_gain (_film->audio_gain ());
- break;
- case Film::CONTENT_AUDIO_STREAM:
- case Film::EXTERNAL_AUDIO:
- case Film::USE_CONTENT_AUDIO:
- setup_channels ();
- break;
- default:
- break;
+ if (p == AudioContentProperty::AUDIO_GAIN) {
+ _plot->set_gain (_content->audio_gain ());
}
}
}
void
-AudioDialog::smoothing_changed (wxScrollEvent &)
+AudioDialog::smoothing_changed ()
{
_plot->set_smoothing (_smoothing->GetValue ());
}
projects / dcpomatic.git / blobdiff