*/
-#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 "wx_util.h"
+#include "lib/audio_analysis.h"
+#include "lib/film.h"
+#include "lib/analyse_audio_job.h"
+#include "lib/audio_content.h"
+#include "lib/job_manager.h"
+#include <boost/filesystem.hpp>
using boost::shared_ptr;
using boost::bind;
wxFont subheading_font (*wxNORMAL_FONT);
subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
- wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
-
+ wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+ wxBoxSizer* lr_sizer = new wxBoxSizer (wxHORIZONTAL);
+
wxBoxSizer* left = new wxBoxSizer (wxVERTICAL);
_plot = new AudioPlot (this);
_peak_time = new wxStaticText (this, wxID_ANY, wxT (""));
left->Add (_peak_time, 0, wxALL, 12);
- sizer->Add (left, 1, wxALL, 12);
+ lr_sizer->Add (left, 1, wxALL, 12);
wxBoxSizer* right = new wxBoxSizer (wxVERTICAL);
m->SetFont (subheading_font);
right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
}
-
+
wxString const types[] = {
_("Peak"),
_("RMS")
m->SetFont (subheading_font);
right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
}
-
+
_smoothing = new wxSlider (this, wxID_ANY, AudioPlot::max_smoothing / 2, 1, AudioPlot::max_smoothing);
_smoothing->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind (&AudioDialog::smoothing_changed, this));
right->Add (_smoothing, 0, wxEXPAND);
- sizer->Add (right, 0, wxALL, 12);
+ lr_sizer->Add (right, 0, wxALL, 12);
- SetSizer (sizer);
- sizer->Layout ();
- sizer->SetSizeHints (this);
-}
+ overall_sizer->Add (lr_sizer);
-void
-AudioDialog::set_content (shared_ptr<AudioContent> c)
-{
- _content_changed_connection.disconnect ();
-
- _content = c;
-
- try_to_load_analysis ();
- _plot->set_gain (_content->audio_gain ());
+#ifdef DCPOMATIC_LINUX
+ wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE);
+ if (buttons) {
+ overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+ }
+#endif
- _content_changed_connection = _content->Changed.connect (bind (&AudioDialog::content_changed, this, _2));
+ SetSizer (overall_sizer);
+ overall_sizer->Layout ();
+ overall_sizer->SetSizeHints (this);
- SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_content->path_summary()).data()));
+ _film_connection = film->ContentChanged.connect (boost::bind (&AudioDialog::try_to_load_analysis, this));
+ SetTitle (_("DCP-o-matic audio"));
}
void
return;
}
- if (!boost::filesystem::exists (_content->audio_analysis_path())) {
+ shared_ptr<const Film> film = _film.lock ();
+ DCPOMATIC_ASSERT (film);
+
+ boost::filesystem::path path = film->audio_analysis_path ();
+
+ if (!boost::filesystem::exists (path)) {
_plot->set_analysis (shared_ptr<AudioAnalysis> ());
_analysis.reset ();
- _analysis_finished_connection = _content->analyse_audio (bind (&AudioDialog::analysis_finished, this));
+ shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film));
+ _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this));
+ JobManager::instance()->add (job);
return;
}
-
- _analysis.reset (new AudioAnalysis (_content->audio_analysis_path ()));
+
+ try {
+ _analysis.reset (new AudioAnalysis (path));
+ } catch (xmlpp::exception& e) {
+ /* Probably an old-style analysis file: recreate it */
+ shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film));
+ _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this));
+ JobManager::instance()->add (job);
+ return;
+ }
+
_plot->set_analysis (_analysis);
setup_peak_time ();
/* Set up some defaults if no check boxes are checked */
-
+
int i = 0;
while (i < MAX_DCP_AUDIO_CHANNELS && (!_channel_checkbox[i] || !_channel_checkbox[i]->GetValue ())) {
++i;
_plot->set_type_visible (i, true);
}
}
+
+ Refresh ();
}
void
AudioDialog::analysis_finished ()
{
- if (!boost::filesystem::exists (_content->audio_analysis_path())) {
+ shared_ptr<const Film> film = _film.lock ();
+ DCPOMATIC_ASSERT (film);
+
+ if (!boost::filesystem::exists (film->audio_analysis_path ())) {
/* We analysed and still nothing showed up, so maybe it was cancelled or it failed.
Give up.
*/
void
AudioDialog::content_changed (int p)
{
- if (p == AudioContentProperty::AUDIO_GAIN) {
- _plot->set_gain (_content->audio_gain ());
- setup_peak_time ();
- } else if (p == AudioContentProperty::AUDIO_MAPPING) {
+ if (p == AudioContentProperty::AUDIO_GAIN || p == AudioContentProperty::AUDIO_STREAMS) {
try_to_load_analysis ();
}
}
if (!_analysis || !_analysis->peak ()) {
return;
}
-
+
shared_ptr<Film> film = _film.lock ();
if (!film) {
return;
}
-
- float peak_dB = 20 * log10 (_analysis->peak().get()) + _content->audio_gain();
-
+
+ float peak_dB = 20 * log10 (_analysis->peak().get());
+
_peak_time->SetLabel (
wxString::Format (
_("Peak is %.2fdB at %s"),
time_to_timecode (_analysis->peak_time().get(), film->video_frame_rate ()).data ()
)
);
-
+
if (peak_dB > -3) {
_peak_time->SetForegroundColour (wxColour (255, 0, 0));
} else {
_peak_time->SetForegroundColour (wxColour (0, 0, 0));
}
}
+
+bool
+AudioDialog::Show (bool show)
+{
+ bool const r = wxDialog::Show (show);
+ try_to_load_analysis ();
+ return r;
+}
+
+
projects / dcpomatic.git / blobdiff