/*
- Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "audio_dialog.h"
#include "audio_plot.h"
#include "wx_util.h"
+#include "static_text.h"
+#include "check_box.h"
#include "lib/audio_analysis.h"
#include "lib/film.h"
#include "lib/analyse_audio_job.h"
wxBoxSizer* left = new wxBoxSizer (wxVERTICAL);
+ _cursor = new StaticText (this, wxT("Cursor: none"));
+ left->Add (_cursor, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
_plot = new AudioPlot (this);
left->Add (_plot, 1, wxTOP | wxEXPAND, 12);
- _sample_peak = new wxStaticText (this, wxID_ANY, wxT (""));
+ _sample_peak = new StaticText (this, wxT (""));
left->Add (_sample_peak, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
- _true_peak = new wxStaticText (this, wxID_ANY, wxT (""));
+ _true_peak = new StaticText (this, wxT (""));
left->Add (_true_peak, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
- _integrated_loudness = new wxStaticText (this, wxID_ANY, wxT (""));
+ _integrated_loudness = new StaticText (this, wxT (""));
left->Add (_integrated_loudness, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
- _loudness_range = new wxStaticText (this, wxID_ANY, wxT (""));
+ _loudness_range = new StaticText (this, wxT (""));
left->Add (_loudness_range, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
- lr_sizer->Add (left, 1, wxALL, 12);
+ lr_sizer->Add (left, 1, wxALL | wxEXPAND, 12);
wxBoxSizer* right = new wxBoxSizer (wxVERTICAL);
{
- wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Channels"));
+ wxStaticText* m = new StaticText (this, _("Channels"));
m->SetFont (subheading_font);
right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 16);
}
- for (int i = 0; i < _channels; ++i) {
- _channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i)));
+ for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
+ _channel_checkbox[i] = new CheckBox (this, std_to_wx(audio_channel_name(i)));
_channel_checkbox[i]->SetForegroundColour(wxColour(_plot->colour(i)));
right->Add (_channel_checkbox[i], 0, wxEXPAND | wxALL, 3);
_channel_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::channel_clicked, this, _1));
}
- for (int i = _channels; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
- _channel_checkbox[i] = 0;
- }
+ show_or_hide_channel_checkboxes ();
{
- wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Type"));
+ wxStaticText* m = new StaticText (this, _("Type"));
m->SetFont (subheading_font);
right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
}
};
for (int i = 0; i < AudioPoint::COUNT; ++i) {
- _type_checkbox[i] = new wxCheckBox (this, wxID_ANY, types[i]);
+ _type_checkbox[i] = new CheckBox (this, types[i]);
right->Add (_type_checkbox[i], 0, wxEXPAND | wxALL, 3);
_type_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::type_clicked, this, _1));
}
{
- wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Smoothing"));
+ wxStaticText* m = new StaticText (this, _("Smoothing"));
m->SetFont (subheading_font);
right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
}
lr_sizer->Add (right, 0, wxALL, 12);
- overall_sizer->Add (lr_sizer);
+ overall_sizer->Add (lr_sizer, 0, wxEXPAND);
#ifdef DCPOMATIC_LINUX
wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE);
overall_sizer->Layout ();
overall_sizer->SetSizeHints (this);
- _film_connection = film->ContentChanged.connect (boost::bind (&AudioDialog::content_changed, this, _2));
- SetTitle (_("DCP-o-matic audio"));
+ _film_connection = film->Change.connect (boost::bind(&AudioDialog::film_change, this, _1, _2));
+ _film_content_connection = film->ContentChange.connect (boost::bind (&AudioDialog::content_change, this, _1, _3));
+ DCPOMATIC_ASSERT (film->directory());
+ SetTitle(wxString::Format(_("DCP-o-matic audio - %s"), std_to_wx(film->directory().get().string())));
if (content) {
_playlist.reset (new Playlist ());
- const_pointer_cast<Playlist> (_playlist)->add (content);
+ const_pointer_cast<Playlist>(_playlist)->add(film, content);
} else {
_playlist = film->playlist ();
}
+
+ _plot->Cursor.connect (bind (&AudioDialog::set_cursor, this, _1, _2));
+}
+
+
+void
+AudioDialog::show_or_hide_channel_checkboxes ()
+{
+ for (int i = 0; i < _channels; ++i) {
+ _channel_checkbox[i]->Show ();
+ }
+
+ for (int i = _channels; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
+ _channel_checkbox[i]->Hide ();
+ }
}
+
void
AudioDialog::try_to_load_analysis ()
{
if (!boost::filesystem::exists (path)) {
_plot->set_analysis (shared_ptr<AudioAnalysis> ());
_analysis.reset ();
+
+ BOOST_FOREACH (shared_ptr<Job> i, JobManager::instance()->get()) {
+ if (dynamic_pointer_cast<AnalyseAudioJob>(i)) {
+ i->cancel ();
+ }
+ }
+
JobManager::instance()->analyse_audio (
film, _playlist, !static_cast<bool>(check), _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this)
);
_plot->set_analysis (_analysis);
_plot->set_gain_correction (_analysis->gain_correction (_playlist));
setup_statistics ();
+ show_or_hide_channel_checkboxes ();
/* Set up some defaults if no check boxes are checked */
}
void
-AudioDialog::content_changed (int p)
+AudioDialog::film_change (ChangeType type, int p)
+{
+ if (type != CHANGE_TYPE_DONE) {
+ return;
+ }
+
+ if (p == Film::AUDIO_CHANNELS) {
+ shared_ptr<Film> film = _film.lock ();
+ if (film) {
+ _channels = film->audio_channels ();
+ try_to_load_analysis ();
+ }
+ }
+}
+
+void
+AudioDialog::content_change (ChangeType type, int p)
{
+ if (type != CHANGE_TYPE_DONE) {
+ return;
+ }
+
if (p == AudioContentProperty::STREAMS) {
try_to_load_analysis ();
} else if (p == AudioContentProperty::GAIN) {
try_to_load_analysis ();
return r;
}
+
+void
+AudioDialog::set_cursor (optional<DCPTime> time, optional<float> db)
+{
+ if (!time || !db) {
+ _cursor->SetLabel (_("Cursor: none"));
+ return;
+ }
+
+ shared_ptr<Film> film = _film.lock();
+ DCPOMATIC_ASSERT (film);
+ _cursor->SetLabel (wxString::Format (_("Cursor: %.1fdB at %s"), *db, time->timecode(film->video_frame_rate())));
+}
projects / dcpomatic.git / blobdiff