From a4b7d0af831b8cd9aafca5f2b264be416a7b1148 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 1 Apr 2021 19:57:20 +0200 Subject: [PATCH] Formatting and C++ tidying. --- src/lib/audio_content.cc | 77 ++++++++++++++++++++++++++-------------- src/lib/audio_content.h | 16 +++++---- 2 files changed, 60 insertions(+), 33 deletions(-) diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 4f5fd8748..748cbb7d0 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,12 +18,13 @@ */ + #include "audio_content.h" -#include "film.h" -#include "exceptions.h" +#include "compose.hpp" #include "config.h" +#include "exceptions.h" +#include "film.h" #include "frame_rate_change.h" -#include "compose.hpp" #include #include #include @@ -31,32 +32,36 @@ #include "i18n.h" -using std::string; + using std::cout; -using std::vector; +using std::dynamic_pointer_cast; using std::fixed; using std::list; +using std::make_shared; using std::pair; using std::setprecision; using std::shared_ptr; -using std::dynamic_pointer_cast; +using std::string; +using std::vector; using boost::optional; using dcp::raw_convert; using namespace dcpomatic; + /** Something stream-related has changed */ int const AudioContentProperty::STREAMS = 200; int const AudioContentProperty::GAIN = 201; int const AudioContentProperty::DELAY = 202; + AudioContent::AudioContent (Content* parent) : ContentPart (parent) - , _gain (0) - , _delay (Config::instance()->default_audio_delay ()) + , _delay (Config::instance()->default_audio_delay()) { } + shared_ptr AudioContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) { @@ -65,19 +70,20 @@ AudioContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) audio streams, so check for that. */ if (node->string_child("Type") == "FFmpeg" && node->node_children("AudioStream").empty()) { - return shared_ptr (); + return {}; } /* Otherwise we can drop through to the newer logic */ } if (!node->optional_number_child ("AudioGain")) { - return shared_ptr (); + return {}; } - return shared_ptr (new AudioContent (parent, node)); + return make_shared(parent, node); } + AudioContent::AudioContent (Content* parent, cxml::ConstNodePtr node) : ContentPart (parent) { @@ -85,16 +91,17 @@ AudioContent::AudioContent (Content* parent, cxml::ConstNodePtr node) _delay = node->number_child ("AudioDelay"); /* Backwards compatibility */ - optional r = node->optional_number_child ("AudioVideoFrameRate"); + auto r = node->optional_number_child("AudioVideoFrameRate"); if (r) { - _parent->set_video_frame_rate (r.get ()); + _parent->set_video_frame_rate (r.get()); } } + AudioContent::AudioContent (Content* parent, vector > c) : ContentPart (parent) { - shared_ptr ref = c[0]->audio; + auto ref = c[0]->audio; DCPOMATIC_ASSERT (ref); for (size_t i = 1; i < c.size(); ++i) { @@ -112,26 +119,30 @@ AudioContent::AudioContent (Content* parent, vector > c) _streams = ref->streams (); } + void AudioContent::as_xml (xmlpp::Node* node) const { boost::mutex::scoped_lock lm (_mutex); - node->add_child("AudioGain")->add_child_text (raw_convert (_gain)); - node->add_child("AudioDelay")->add_child_text (raw_convert (_delay)); + node->add_child("AudioGain")->add_child_text(raw_convert(_gain)); + node->add_child("AudioDelay")->add_child_text(raw_convert(_delay)); } + void AudioContent::set_gain (double g) { maybe_set (_gain, g, AudioContentProperty::GAIN); } + void AudioContent::set_delay (int d) { maybe_set (_delay, d, AudioContentProperty::DELAY); } + string AudioContent::technical_summary () const { @@ -143,6 +154,7 @@ AudioContent::technical_summary () const return s; } + void AudioContent::set_mapping (AudioMapping mapping) { @@ -150,10 +162,10 @@ AudioContent::set_mapping (AudioMapping mapping) int c = 0; for (auto i: streams()) { - AudioMapping stream_mapping (i->channels (), MAX_DCP_AUDIO_CHANNELS); + AudioMapping stream_mapping (i->channels(), MAX_DCP_AUDIO_CHANNELS); for (int j = 0; j < i->channels(); ++j) { for (int k = 0; k < MAX_DCP_AUDIO_CHANNELS; ++k) { - stream_mapping.set (j, k, mapping.get (c, k)); + stream_mapping.set (j, k, mapping.get(c, k)); } ++c; } @@ -161,6 +173,7 @@ AudioContent::set_mapping (AudioMapping mapping) } } + AudioMapping AudioContent::mapping () const { @@ -175,11 +188,11 @@ AudioContent::mapping () const int c = 0; int s = 0; for (auto i: streams()) { - AudioMapping mapping = i->mapping (); + auto mapping = i->mapping (); for (int j = 0; j < mapping.input_channels(); ++j) { for (int k = 0; k < MAX_DCP_AUDIO_CHANNELS; ++k) { if (k < mapping.output_channels()) { - merged.set (c, k, mapping.get (j, k)); + merged.set (c, k, mapping.get(j, k)); } } ++c; @@ -190,6 +203,7 @@ AudioContent::mapping () const return merged; } + /** @return the frame rate that this content should be resampled to in order * that it is in sync with the active video content at its start time. */ @@ -215,7 +229,7 @@ AudioContent::resampled_frame_rate (shared_ptr film) const string AudioContent::processing_description (shared_ptr film) const { - if (streams().empty ()) { + if (streams().empty()) { return ""; } @@ -263,6 +277,7 @@ AudioContent::processing_description (shared_ptr film) const return ""; } + /** @return User-visible names of each of our audio channels */ vector AudioContent::channel_names () const @@ -281,17 +296,18 @@ AudioContent::channel_names () const return n; } + void AudioContent::add_properties (shared_ptr film, list& p) const { shared_ptr stream; if (streams().size() == 1) { - stream = streams().front (); + stream = streams().front(); } if (stream) { - p.push_back (UserProperty (UserProperty::AUDIO, _("Channels"), stream->channels ())); - p.push_back (UserProperty (UserProperty::AUDIO, _("Content audio sample rate"), stream->frame_rate(), _("Hz"))); + p.push_back (UserProperty(UserProperty::AUDIO, _("Channels"), stream->channels())); + p.push_back (UserProperty(UserProperty::AUDIO, _("Content audio sample rate"), stream->frame_rate(), _("Hz"))); } FrameRateChange const frc (_parent->active_video_frame_rate(film), film->video_frame_rate()); @@ -311,8 +327,8 @@ AudioContent::add_properties (shared_ptr film, list& p ); } - p.push_back (UserProperty (UserProperty::AUDIO, _("DCP sample rate"), resampled_frame_rate(film), _("Hz"))); - p.push_back (UserProperty (UserProperty::LENGTH, _("Full length in video frames at DCP rate"), c.frames_round (frc.dcp))); + p.push_back (UserProperty(UserProperty::AUDIO, _("DCP sample rate"), resampled_frame_rate(film), _("Hz"))); + p.push_back (UserProperty(UserProperty::LENGTH, _("Full length in video frames at DCP rate"), c.frames_round (frc.dcp))); if (stream) { p.push_back ( @@ -325,6 +341,7 @@ AudioContent::add_properties (shared_ptr film, list& p } } + void AudioContent::set_streams (vector streams) { @@ -336,6 +353,7 @@ AudioContent::set_streams (vector streams) } } + AudioStreamPtr AudioContent::stream () const { @@ -344,6 +362,7 @@ AudioContent::stream () const return _streams.front (); } + void AudioContent::add_stream (AudioStreamPtr stream) { @@ -355,6 +374,7 @@ AudioContent::add_stream (AudioStreamPtr stream) } } + void AudioContent::set_stream (AudioStreamPtr stream) { @@ -367,6 +387,7 @@ AudioContent::set_stream (AudioStreamPtr stream) } } + void AudioContent::take_settings_from (shared_ptr c) { @@ -383,12 +404,14 @@ AudioContent::take_settings_from (shared_ptr c) } } + void AudioContent::modify_position (shared_ptr film, DCPTime& pos) const { pos = pos.round (film->audio_frame_rate()); } + void AudioContent::modify_trim_start (ContentTime& trim) const { diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h index 83a5e327e..67183d0a4 100644 --- a/src/lib/audio_content.h +++ b/src/lib/audio_content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,17 +18,21 @@ */ + /** @file src/lib/audio_content.h * @brief AudioContent and AudioContentProperty classes. */ + #ifndef DCPOMATIC_AUDIO_CONTENT_H #define DCPOMATIC_AUDIO_CONTENT_H + #include "content_part.h" #include "audio_stream.h" #include "audio_mapping.h" + /** @class AudioContentProperty * @brief Names for properties of AudioContent. */ @@ -40,11 +44,13 @@ public: static int const DELAY; }; + class AudioContent : public ContentPart { public: explicit AudioContent (Content* parent); - AudioContent (Content* parent, std::vector >); + AudioContent (Content* parent, std::vector>); + AudioContent (Content* parent, cxml::ConstNodePtr); void as_xml (xmlpp::Node *) const; std::string technical_summary () const; @@ -89,12 +95,10 @@ public: private: - AudioContent (Content* parent, cxml::ConstNodePtr); - /** Gain to apply to audio in dB */ - double _gain; + double _gain = 0; /** Delay to apply to audio (positive moves audio later) in milliseconds */ - int _delay; + int _delay = 0; std::vector _streams; }; -- 2.30.2