/*
- Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
-#include "audio_panel.h"
-#include "audio_mapping_view.h"
-#include "wx_util.h"
-#include "gain_calculator_dialog.h"
-#include "content_panel.h"
+
#include "audio_dialog.h"
-#include "static_text.h"
+#include "audio_mapping_view.h"
+#include "audio_panel.h"
#include "check_box.h"
+#include "content_panel.h"
#include "dcpomatic_button.h"
+#include "gain_calculator_dialog.h"
+#include "static_text.h"
+#include "wx_util.h"
#include "lib/config.h"
#include "lib/ffmpeg_audio_stream.h"
#include "lib/ffmpeg_content.h"
#include "lib/dcp_content.h"
#include "lib/audio_content.h"
#include <wx/spinctrl.h>
-#include <boost/foreach.hpp>
#include <iostream>
+
using std::vector;
using std::cout;
using std::string;
using std::list;
using std::pair;
-using boost::dynamic_pointer_cast;
-using boost::shared_ptr;
+using std::make_shared;
+using std::dynamic_pointer_cast;
+using std::shared_ptr;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
AudioPanel::AudioPanel (ContentPanel* p)
: ContentSubPanel (p, _("Audio"))
_reference = new CheckBox (this, _("Use this DCP's audio as OV and make VF"));
_reference_note = new StaticText (this, wxT(""));
_reference_note->Wrap (200);
- wxFont font = _reference_note->GetFont();
+ auto font = _reference_note->GetFont();
font.SetStyle(wxFONTSTYLE_ITALIC);
font.SetPointSize(font.GetPointSize() - 1);
_reference_note->SetFont(font);
_delay->wrapped()->SetRange (-1000, 1000);
content_selection_changed ();
- film_changed (Film::AUDIO_CHANNELS);
- film_changed (Film::VIDEO_FRAME_RATE);
- film_changed (Film::REEL_TYPE);
+ film_changed (Film::Property::AUDIO_CHANNELS);
+ film_changed (Film::Property::VIDEO_FRAME_RATE);
+ film_changed (Film::Property::REEL_TYPE);
_reference->Bind (wxEVT_CHECKBOX, boost::bind (&AudioPanel::reference_clicked, this));
_show->Bind (wxEVT_BUTTON, boost::bind (&AudioPanel::show_clicked, this));
void
AudioPanel::add_to_grid ()
{
- bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
-
int r = 0;
- _reference->Show (full);
- _reference_note->Show (full);
-
- if (full) {
- wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
- reference_sizer->Add (_reference, 0);
- reference_sizer->Add (_reference_note, 0);
- _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 4));
- ++r;
- }
+ auto reference_sizer = new wxBoxSizer (wxVERTICAL);
+ reference_sizer->Add (_reference, 0);
+ reference_sizer->Add (_reference_note, 0);
+ _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 4));
+ ++r;
_grid->Add (_show, wxGBPosition (r, 0), wxGBSpan (1, 2));
_grid->Add (_peak, wxGBPosition (r, 2), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL);
add_label_to_sizer (_grid, _gain_label, true, wxGBPosition(r, 0));
{
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- s->Add (_gain->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+ auto s = new wxBoxSizer (wxHORIZONTAL);
+ s->Add (_gain->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_GAP);
s->Add (_gain_db_label, 0, wxALIGN_CENTER_VERTICAL);
_grid->Add (s, wxGBPosition(r, 1));
}
- _gain_calculate_button->Show (full);
-
- if (full) {
- _grid->Add (_gain_calculate_button, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- ++r;
- }
-
- _delay_label->Show (full);
- _delay->show (full);
- _delay_ms_label->Show (full);
+ _grid->Add (_gain_calculate_button, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+ ++r;
- if (full) {
- add_label_to_sizer (_grid, _delay_label, true, wxGBPosition(r, 0));
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- s->Add (_delay->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
- s->Add (_delay_ms_label, 0, wxALIGN_CENTER_VERTICAL);
- _grid->Add (s, wxGBPosition(r, 1));
- ++r;
- }
+ add_label_to_sizer (_grid, _delay_label, true, wxGBPosition(r, 0));
+ auto s = new wxBoxSizer (wxHORIZONTAL);
+ s->Add (_delay->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_GAP);
+ s->Add (_delay_ms_label, 0, wxALIGN_CENTER_VERTICAL);
+ _grid->Add (s, wxGBPosition(r, 1));
+ ++r;
}
AudioPanel::~AudioPanel ()
{
if (_audio_dialog) {
_audio_dialog->Destroy ();
- _audio_dialog = 0;
+ _audio_dialog = nullptr;
}
}
}
switch (property) {
- case Film::AUDIO_CHANNELS:
- case Film::AUDIO_PROCESSOR:
+ case Film::Property::AUDIO_CHANNELS:
+ case Film::Property::AUDIO_PROCESSOR:
_mapping->set_output_channels (_parent->film()->audio_output_names ());
setup_peak ();
break;
- case Film::VIDEO_FRAME_RATE:
+ case Film::Property::VIDEO_FRAME_RATE:
setup_description ();
break;
- case Film::REEL_TYPE:
- case Film::INTEROP:
+ case Film::Property::REEL_TYPE:
+ case Film::Property::INTEROP:
setup_sensitivity ();
break;
default:
void
AudioPanel::film_content_changed (int property)
{
- ContentList ac = _parent->selected_audio ();
+ auto ac = _parent->selected_audio ();
if (property == AudioContentProperty::STREAMS) {
if (ac.size() == 1) {
_mapping->set (ac.front()->audio->mapping());
vector<AudioMappingView::Group> groups;
int c = 0;
- BOOST_FOREACH (shared_ptr<const AudioStream> i, ac.front()->audio->streams()) {
- shared_ptr<const FFmpegAudioStream> f = dynamic_pointer_cast<const FFmpegAudioStream> (i);
+ for (auto i: ac.front()->audio->streams()) {
+ auto f = dynamic_pointer_cast<const FFmpegAudioStream> (i);
string name = "";
if (f) {
name = f->name;
}
setup_description ();
setup_peak ();
- _sizer->Layout ();
+ layout ();
} else if (property == AudioContentProperty::GAIN) {
setup_peak ();
} else if (property == DCPContentProperty::REFERENCE_AUDIO) {
void
AudioPanel::gain_calculate_button_clicked ()
{
- GainCalculatorDialog* d = new GainCalculatorDialog (this);
- int const r = d->ShowModal ();
- optional<float> c = d->db_change();
+ auto d = new GainCalculatorDialog (this);
+ auto const r = d->ShowModal ();
+ auto c = d->db_change();
if (r == wxID_CANCEL || !c) {
d->Destroy ();
return;
}
- optional<float> old_peak_dB = peak ();
- double old_value = _gain->wrapped()->GetValue();
+ auto old_peak_dB = peak ();
+ auto old_value = _gain->wrapped()->GetValue();
_gain->wrapped()->SetValue(old_value + *c);
/* This appears to be necessary, as the change is not signalled,
*/
_gain->view_changed ();
- optional<float> peak_dB = peak ();
+ auto peak_dB = peak ();
if (old_peak_dB && *old_peak_dB < -0.5 && peak_dB && *peak_dB > -0.5) {
error_dialog (this, _("It is not possible to adjust the content's gain for this fader change as it would cause the DCP's audio to clip. The gain has not been changed."));
_gain->wrapped()->SetValue (old_value);
void
AudioPanel::setup_description ()
{
- ContentList ac = _parent->selected_audio ();
+ auto ac = _parent->selected_audio ();
if (ac.size () != 1) {
checked_set (_description, wxT (""));
return;
void
AudioPanel::mapping_changed (AudioMapping m)
{
- ContentList c = _parent->selected_audio ();
+ auto c = _parent->selected_audio ();
if (c.size() == 1) {
c.front()->audio->set_mapping (m);
}
void
AudioPanel::content_selection_changed ()
{
- ContentList sel = _parent->selected_audio ();
+ auto sel = _parent->selected_audio ();
_gain->set_content (sel);
_delay->set_content (sel);
void
AudioPanel::setup_sensitivity ()
{
- ContentList sel = _parent->selected_audio ();
+ auto sel = _parent->selected_audio ();
shared_ptr<DCPContent> dcp;
if (sel.size() == 1) {
}
setup_refer_button (_reference, _reference_note, dcp, can_reference, cannot);
- if (_reference->GetValue ()) {
- _gain->wrapped()->Enable (false);
- _gain_calculate_button->Enable (false);
- _show->Enable (true);
- _peak->Enable (false);
- _delay->wrapped()->Enable (false);
- _mapping->Enable (false);
- _description->Enable (false);
- } else {
- _gain->wrapped()->Enable (sel.size() == 1);
- _gain_calculate_button->Enable (sel.size() == 1);
- _show->Enable (sel.size() == 1);
- _peak->Enable (sel.size() == 1);
- _delay->wrapped()->Enable (sel.size() == 1);
- _mapping->Enable (sel.size() == 1);
- _description->Enable (sel.size() == 1);
- }
+ auto const ref = _reference->GetValue();
+ auto const single = sel.size() == 1;
+
+ _gain->wrapped()->Enable (!ref);
+ _gain_calculate_button->Enable (!ref && single);
+ _show->Enable (single);
+ _peak->Enable (!ref && single);
+ _delay->wrapped()->Enable (!ref);
+ _mapping->Enable (!ref && single);
+ _description->Enable (!ref && single);
}
void
{
if (_audio_dialog) {
_audio_dialog->Destroy ();
- _audio_dialog = 0;
+ _audio_dialog = nullptr;
}
- ContentList ac = _parent->selected_audio ();
+ auto ac = _parent->selected_audio ();
if (ac.size() != 1) {
return;
}
- _audio_dialog = new AudioDialog (this, _parent->film (), ac.front ());
+ _audio_dialog = new AudioDialog (this, _parent->film(), _parent->film_viewer(), ac.front());
_audio_dialog->Show ();
}
{
optional<float> peak_dB;
- ContentList sel = _parent->selected_audio ();
+ auto sel = _parent->selected_audio ();
if (sel.size() == 1) {
- shared_ptr<Playlist> playlist (new Playlist);
+ auto playlist = make_shared<Playlist>();
playlist->add (_parent->film(), sel.front());
try {
- shared_ptr<AudioAnalysis> analysis (new AudioAnalysis(_parent->film()->audio_analysis_path(playlist)));
+ auto analysis = make_shared<AudioAnalysis>(_parent->film()->audio_analysis_path(playlist));
peak_dB = linear_to_db(analysis->overall_sample_peak().first.peak) + analysis->gain_correction(playlist);
} catch (...) {
void
AudioPanel::setup_peak ()
{
- ContentList sel = _parent->selected_audio ();
+ auto sel = _parent->selected_audio ();
- optional<float> peak_dB = peak ();
+ auto peak_dB = peak ();
if (sel.size() != 1) {
_peak->SetLabel (wxT(""));
} else {
}
}
- static wxColour normal = _peak->GetForegroundColour ();
+ static auto normal = _peak->GetForegroundColour ();
if (peak_dB && *peak_dB > -0.5) {
_peak->SetForegroundColour (wxColour (255, 0, 0));
void
AudioPanel::reference_clicked ()
{
- ContentList c = _parent->selected ();
+ auto c = _parent->selected ();
if (c.size() != 1) {
return;
}
- shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent> (c.front ());
+ auto d = dynamic_pointer_cast<DCPContent>(c.front());
if (!d) {
return;
}
/* We are changing film, so destroy any audio dialog for the old one */
if (_audio_dialog) {
_audio_dialog->Destroy ();
- _audio_dialog = 0;
+ _audio_dialog = nullptr;
}
}
+
projects / dcpomatic.git / blobdiff