/*
- Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2021 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 "static_text.h"
+#include "wx_util.h"
#include "lib/analyse_audio_job.h"
+#include "lib/audio_analysis.h"
#include "lib/audio_content.h"
+#include "lib/film.h"
#include "lib/job_manager.h"
#include <libxml++/libxml++.h>
#include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
#include <iostream>
using std::cout;
using std::list;
-using std::vector;
+using std::make_shared;
using std::pair;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::vector;
+using std::weak_ptr;
using boost::bind;
using boost::optional;
using boost::const_pointer_cast;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
/** @param parent Parent window.
* @param film Film we are using.
, _viewer (viewer)
, _content (content)
, _channels (film->audio_channels ())
- , _plot (0)
+ , _plot (nullptr)
{
wxFont subheading_font (*wxNORMAL_FONT);
subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
- wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
- wxBoxSizer* lr_sizer = new wxBoxSizer (wxHORIZONTAL);
+ auto overall_sizer = new wxBoxSizer (wxVERTICAL);
+ auto lr_sizer = new wxBoxSizer (wxHORIZONTAL);
- wxBoxSizer* left = new wxBoxSizer (wxVERTICAL);
+ auto left = new wxBoxSizer (wxVERTICAL);
_cursor = new StaticText (this, wxT("Cursor: none"));
left->Add (_cursor, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
lr_sizer->Add (left, 1, wxALL | wxEXPAND, 12);
- wxBoxSizer* right = new wxBoxSizer (wxVERTICAL);
+ auto right = new wxBoxSizer (wxVERTICAL);
{
- wxStaticText* m = new StaticText (this, _("Channels"));
+ auto m = new StaticText (this, _("Channels"));
m->SetFont (subheading_font);
- right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 16);
+ right->Add (m, 1, wxTOP | wxBOTTOM, 16);
}
for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
_channel_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::channel_clicked, this, _1));
}
+ show_or_hide_channel_checkboxes ();
+
{
- wxStaticText* m = new StaticText (this, _("Type"));
+ auto m = new StaticText (this, _("Type"));
m->SetFont (subheading_font);
- right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+ right->Add (m, 1, wxTOP, 16);
}
wxString const types[] = {
}
{
- wxStaticText* m = new StaticText (this, _("Smoothing"));
+ auto m = new StaticText (this, _("Smoothing"));
m->SetFont (subheading_font);
- right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+ right->Add (m, 1, wxTOP, 16);
}
_smoothing = new wxSlider (this, wxID_ANY, AudioPlot::max_smoothing / 2, 1, AudioPlot::max_smoothing);
overall_sizer->Add (lr_sizer, 0, wxEXPAND);
#ifdef DCPOMATIC_LINUX
- wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE);
+ auto buttons = CreateSeparatedButtonSizer (wxCLOSE);
if (buttons) {
overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
}
overall_sizer->SetSizeHints (this);
_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));
+ _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) {
+ SetTitle(wxString::Format(_("DCP-o-matic audio - %s"), std_to_wx(content->path(0).string())));
+ } else {
+ SetTitle(wxString::Format(_("DCP-o-matic audio - %s"), std_to_wx(film->directory().get().string())));
+ }
if (content) {
- _playlist.reset (new Playlist ());
+ _playlist = make_shared<Playlist>();
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 ()
{
return;
}
- shared_ptr<const Film> film = _film.lock ();
+ auto film = _film.lock ();
DCPOMATIC_ASSERT (film);
- shared_ptr<Content> check = _content.lock();
+ auto check = _content.lock();
- boost::filesystem::path const path = film->audio_analysis_path (_playlist);
+ auto const path = film->audio_analysis_path (_playlist);
if (!boost::filesystem::exists (path)) {
_plot->set_analysis (shared_ptr<AudioAnalysis> ());
_analysis.reset ();
- BOOST_FOREACH (shared_ptr<Job> i, JobManager::instance()->get()) {
+ for (auto i: JobManager::instance()->get()) {
if (dynamic_pointer_cast<AnalyseAudioJob>(i)) {
i->cancel ();
}
_plot->set_analysis (_analysis);
_plot->set_gain_correction (_analysis->gain_correction (_playlist));
setup_statistics ();
-
- 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 ();
- }
+ show_or_hide_channel_checkboxes ();
/* Set up some defaults if no check boxes are checked */
/* Nothing checked; check mapped ones */
list<int> mapped;
- shared_ptr<Content> content = _content.lock ();
+ auto content = _content.lock ();
if (content) {
mapped = content->audio->mapping().mapped_output_channels ();
mapped = film->mapped_audio_channels ();
}
- BOOST_FOREACH (int i, mapped) {
+ for (auto i: mapped) {
if (_channel_checkbox[i]) {
_channel_checkbox[i]->SetValue (true);
_plot->set_channel_visible (i, true);
void
AudioDialog::analysis_finished ()
{
- shared_ptr<const Film> film = _film.lock ();
+ auto film = _film.lock ();
if (!film) {
/* This should not happen, but if it does we should just give up quietly */
return;
}
void
-AudioDialog::film_change (ChangeType type, int p)
+AudioDialog::film_change (ChangeType type, Film::Property p)
{
- if (type != CHANGE_TYPE_DONE) {
+ if (type != ChangeType::DONE) {
return;
}
- if (p == Film::AUDIO_CHANNELS) {
- shared_ptr<Film> film = _film.lock ();
+ if (p == Film::Property::AUDIO_CHANNELS) {
+ auto 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) {
+ if (type != ChangeType::DONE) {
return;
}
return;
}
- shared_ptr<Film> film = _film.lock ();
+ auto film = _film.lock ();
if (!film) {
return;
}
- pair<AudioAnalysis::PeakTime, int> const peak = _analysis->overall_sample_peak ();
+ auto const peak = _analysis->overall_sample_peak ();
float const peak_dB = linear_to_db(peak.first.peak) + _analysis->gain_correction(_playlist);
_sample_peak->SetLabel (
wxString::Format (
/* XXX: check whether it's ok to add dB gain to these quantities */
- if (static_cast<bool>(_analysis->integrated_loudness ())) {
+ if (static_cast<bool>(_analysis->integrated_loudness())) {
_integrated_loudness->SetLabel (
wxString::Format (
_("Integrated loudness %.2f LUFS"),
);
}
- if (static_cast<bool>(_analysis->loudness_range ())) {
+ if (static_cast<bool>(_analysis->loudness_range())) {
_loudness_range->SetLabel (
wxString::Format (
_("Loudness range %.2f LU"),
return;
}
- shared_ptr<Film> film = _film.lock();
+ auto 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