/*
- 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.
using std::map;
using std::pair;
using std::shared_ptr;
+using std::make_shared;
using boost::optional;
using namespace dcpomatic;
time += ContentTime::from_seconds (_content->delay() / 1000.0);
}
- bool reset = false;
+ auto reset = false;
if (_positions[stream] == 0) {
/* This is the first data we have received since initialisation or seek. Set
the position based on the ContentTime that was given. After this first time
}
shared_ptr<Resampler> resampler;
- ResamplerMap::iterator i = _resamplers.find(stream);
+ auto i = _resamplers.find(stream);
if (i != _resamplers.end ()) {
resampler = i->second;
} else {
stream->channels()
);
- resampler.reset (new Resampler(stream->frame_rate(), resampled_rate, stream->channels()));
+ resampler = make_shared<Resampler>(stream->frame_rate(), resampled_rate, stream->channels());
if (_fast) {
resampler->set_fast ();
}
}
if (resampler) {
- shared_ptr<const AudioBuffers> ro = resampler->run (data);
+ auto ro = resampler->run (data);
if (ro->frames() == 0) {
return;
}
ContentTime
AudioDecoder::stream_position (shared_ptr<const Film> film, AudioStreamPtr stream) const
{
- PositionMap::const_iterator i = _positions.find (stream);
+ auto i = _positions.find (stream);
DCPOMATIC_ASSERT (i != _positions.end ());
return ContentTime::from_frames (i->second, _content->resampled_frame_rate(film));
}
AudioDecoder::position (shared_ptr<const Film> film) const
{
optional<ContentTime> p;
- for (PositionMap::const_iterator i = _positions.begin(); i != _positions.end(); ++i) {
- ContentTime const ct = stream_position (film, i->first);
+ for (auto i: _positions) {
+ auto const ct = stream_position (film, i.first);
if (!p || ct < *p) {
p = ct;
}
void
AudioDecoder::seek ()
{
- for (ResamplerMap::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) {
- i->second->flush ();
- i->second->reset ();
+ for (auto i: _resamplers) {
+ i.second->flush ();
+ i.second->reset ();
}
- for (PositionMap::iterator i = _positions.begin(); i != _positions.end(); ++i) {
- i->second = 0;
+ for (auto& i: _positions) {
+ i.second = 0;
}
}
void
AudioDecoder::flush ()
{
- for (ResamplerMap::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) {
- shared_ptr<const AudioBuffers> ro = i->second->flush ();
+ for (auto const& i: _resamplers) {
+ auto ro = i.second->flush ();
if (ro->frames() > 0) {
- Data (i->first, ContentAudio (ro, _positions[i->first]));
- _positions[i->first] += ro->frames();
+ Data (i.first, ContentAudio (ro, _positions[i.first]));
+ _positions[i.first] += ro->frames();
}
}
{
for (auto i: _content->streams()) {
int const samples = ContentTime::from_seconds(milliseconds / 1000.0).frames_round(i->frame_rate());
- shared_ptr<AudioBuffers> silence (new AudioBuffers (i->channels(), samples));
+ auto silence = make_shared<AudioBuffers>(i->channels(), samples);
silence->make_silent ();
Data (i, ContentAudio (silence, _positions[i]));
}
/*
- 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.
using std::string;
using std::list;
using std::pair;
+using std::make_shared;
using std::dynamic_pointer_cast;
using std::shared_ptr;
using boost::optional;
_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);
{
int r = 0;
- wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
+ 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));
add_label_to_sizer (_grid, _gain_label, true, wxGBPosition(r, 0));
{
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ auto s = new wxBoxSizer (wxHORIZONTAL);
s->Add (_gain->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
s->Add (_gain_db_label, 0, wxALIGN_CENTER_VERTICAL);
_grid->Add (s, wxGBPosition(r, 1));
++r;
add_label_to_sizer (_grid, _delay_label, true, wxGBPosition(r, 0));
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ auto 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));
{
if (_audio_dialog) {
_audio_dialog->Destroy ();
- _audio_dialog = 0;
+ _audio_dialog = nullptr;
}
}
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;
for (auto i: ac.front()->audio->streams()) {
- shared_ptr<const FFmpegAudioStream> f = dynamic_pointer_cast<const FFmpegAudioStream> (i);
+ auto f = dynamic_pointer_cast<const FFmpegAudioStream> (i);
string name = "";
if (f) {
name = f->name;
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) {
{
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;
}
{
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;
}
}