X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Faudio_content.cc;h=b159aa50d4f47a6851c126d15512defd9aad00c6;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=2832e257578ccad10f06714ea96cd201f9f8dceb;hpb=65b331d32c383f3a9049f29bf03ab3fe3193b31a;p=dcpomatic.git diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 2832e2575..b159aa50d 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2013-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -44,51 +45,59 @@ using boost::dynamic_pointer_cast; using boost::optional; /** Something stream-related has changed */ -int const AudioContentProperty::AUDIO_STREAMS = 200; -int const AudioContentProperty::AUDIO_GAIN = 201; -int const AudioContentProperty::AUDIO_DELAY = 202; -int const AudioContentProperty::AUDIO_VIDEO_FRAME_RATE = 203; - -AudioContent::AudioContent (Content* parent, shared_ptr film) - : ContentPart (parent, film) - , _audio_gain (0) - , _audio_delay (Config::instance()->default_audio_delay ()) +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 ()) { } -AudioContent::AudioContent (Content* parent, shared_ptr film, cxml::ConstNodePtr node) - : ContentPart (parent, film) +shared_ptr +AudioContent::from_xml (Content* parent, cxml::ConstNodePtr node) { - _audio_gain = node->number_child ("AudioGain"); - _audio_delay = node->number_child ("AudioDelay"); - _audio_video_frame_rate = node->optional_number_child ("AudioVideoFrameRate"); + if (!node->optional_number_child ("AudioGain")) { + return shared_ptr (); + } + + return shared_ptr (new AudioContent (parent, node)); +} + +AudioContent::AudioContent (Content* parent, cxml::ConstNodePtr node) + : ContentPart (parent) +{ + _gain = node->number_child ("AudioGain"); + _delay = node->number_child ("AudioDelay"); + + /* Backwards compatibility */ + optional r = node->optional_number_child ("AudioVideoFrameRate"); + if (r) { + _parent->set_video_frame_rate (r.get ()); + } } -AudioContent::AudioContent (Content* parent, shared_ptr film, vector > c) - : ContentPart (parent, film) +AudioContent::AudioContent (Content* parent, vector > c) + : ContentPart (parent) { shared_ptr ref = c[0]->audio; DCPOMATIC_ASSERT (ref); for (size_t i = 1; i < c.size(); ++i) { - if (c[i]->audio->audio_gain() != ref->audio_gain()) { + if (c[i]->audio->gain() != ref->gain()) { throw JoinError (_("Content to be joined must have the same audio gain.")); } - if (c[i]->audio->audio_delay() != ref->audio_delay()) { + if (c[i]->audio->delay() != ref->delay()) { throw JoinError (_("Content to be joined must have the same audio delay.")); } - - if (ac->audio_video_frame_rate() != ref->audio_video_frame_rate()) { - throw JoinError (_("Content to be joined must have the same video frame rate.")); - } } - _audio_gain = ref->audio_gain (); - _audio_delay = ref->audio_delay (); - /* Preserve the optional<> part of this */ - _audio_video_frame_rate = ref->_audio_video_frame_rate; + _gain = ref->gain (); + _delay = ref->delay (); _streams = ref->streams (); } @@ -96,23 +105,20 @@ void AudioContent::as_xml (xmlpp::Node* node) const { boost::mutex::scoped_lock lm (_mutex); - node->add_child("AudioGain")->add_child_text (raw_convert (_audio_gain)); - node->add_child("AudioDelay")->add_child_text (raw_convert (_audio_delay)); - if (_audio_video_frame_rate) { - node->add_child("AudioVideoFrameRate")->add_child_text (raw_convert (_audio_video_frame_rate.get())); - } + node->add_child("AudioGain")->add_child_text (raw_convert (_gain)); + node->add_child("AudioDelay")->add_child_text (raw_convert (_delay)); } void -AudioContent::set_audio_gain (double g) +AudioContent::set_gain (double g) { - maybe_set (_audio_gain, g, AudioContentProperty::AUDIO_GAIN); + maybe_set (_gain, g, AudioContentProperty::GAIN); } void -AudioContent::set_audio_delay (int d) +AudioContent::set_delay (int d) { - maybe_set (_audio_delay, d, AudioContentProperty::AUDIO_DELAY); + maybe_set (_delay, d, AudioContentProperty::DELAY); } string @@ -127,7 +133,7 @@ AudioContent::technical_summary () const } void -AudioContent::set_audio_mapping (AudioMapping mapping) +AudioContent::set_mapping (AudioMapping mapping) { int c = 0; BOOST_FOREACH (AudioStreamPtr i, streams ()) { @@ -141,11 +147,11 @@ AudioContent::set_audio_mapping (AudioMapping mapping) i->set_mapping (stream_mapping); } - _parent->signal_changed (AudioContentProperty::AUDIO_STREAMS); + _parent->signal_changed (AudioContentProperty::STREAMS); } AudioMapping -AudioContent::audio_mapping () const +AudioContent::mapping () const { int channels = 0; BOOST_FOREACH (AudioStreamPtr i, streams ()) { @@ -177,14 +183,12 @@ AudioContent::audio_mapping () const * that it is in sync with the active video content at its start time. */ int -AudioContent::resampled_audio_frame_rate () const +AudioContent::resampled_frame_rate () const { /* Resample to a DCI-approved sample rate */ double t = has_rate_above_48k() ? 96000 : 48000; - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - FrameRateChange frc (audio_video_frame_rate(), film->video_frame_rate()); + FrameRateChange frc (_parent->active_video_frame_rate(), _parent->film()->video_frame_rate()); /* Compensate if the DCP is being run at a different frame rate to the source; that is, if the video is run such that it will @@ -218,7 +222,7 @@ AudioContent::processing_description () const optional common_frame_rate; BOOST_FOREACH (AudioStreamPtr i, streams()) { - if (i->frame_rate() != resampled_audio_frame_rate()) { + if (i->frame_rate() != resampled_frame_rate()) { resampled = true; } else { not_resampled = true; @@ -235,14 +239,14 @@ AudioContent::processing_description () const } if (not_resampled && resampled) { - return String::compose (_("Some audio will be resampled to %1kHz"), resampled_audio_frame_rate ()); + return String::compose (_("Some audio will be resampled to %1kHz"), resampled_frame_rate ()); } if (!not_resampled && resampled) { if (same) { - return String::compose (_("Audio will be resampled from %1kHz to %2kHz"), common_frame_rate.get(), resampled_audio_frame_rate ()); + return String::compose (_("Audio will be resampled from %1kHz to %2kHz"), common_frame_rate.get(), resampled_frame_rate ()); } else { - return String::compose (_("Audio will be resampled to %1kHz"), resampled_audio_frame_rate ()); + return String::compose (_("Audio will be resampled to %1kHz"), resampled_frame_rate ()); } } @@ -264,7 +268,7 @@ AudioContent::has_rate_above_48k () const /** @return User-visible names of each of our audio channels */ vector -AudioContent::audio_channel_names () const +AudioContent::channel_names () const { vector n; @@ -289,13 +293,10 @@ AudioContent::add_properties (list& p) const if (stream) { p.push_back (UserProperty (_("Audio"), _("Channels"), stream->channels ())); - p.push_back (UserProperty (_("Audio"), _("Content audio frame rate"), stream->frame_rate(), _("Hz"))); + p.push_back (UserProperty (_("Audio"), _("Content audio sample rate"), stream->frame_rate(), _("Hz"))); } - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - - FrameRateChange const frc (audio_video_frame_rate(), film->video_frame_rate()); + FrameRateChange const frc (_parent->active_video_frame_rate(), _parent->film()->video_frame_rate()); ContentTime const c (_parent->full_length(), frc); p.push_back ( @@ -306,53 +307,27 @@ AudioContent::add_properties (list& p) const p.push_back ( UserProperty ( _("Length"), - _("Full length in audio frames at content rate"), + _("Full length in audio samples at content rate"), c.frames_round (stream->frame_rate ()) ) ); } - p.push_back (UserProperty (_("Audio"), _("DCP frame rate"), resampled_audio_frame_rate (), _("Hz"))); + p.push_back (UserProperty (_("Audio"), _("DCP frame rate"), resampled_frame_rate (), _("Hz"))); p.push_back (UserProperty (_("Length"), _("Full length in video frames at DCP rate"), c.frames_round (frc.dcp))); if (stream) { p.push_back ( UserProperty ( _("Length"), - _("Full length in audio frames at DCP rate"), - c.frames_round (resampled_audio_frame_rate ()) + _("Full length in audio samples at DCP rate"), + c.frames_round (resampled_frame_rate ()) ) ); } } void -AudioContent::set_audio_video_frame_rate (double r) -{ - { - boost::mutex::scoped_lock lm (_mutex); - _audio_video_frame_rate = r; - } - - signal_changed (AudioContentProperty::AUDIO_VIDEO_FRAME_RATE); -} - -double -AudioContent::audio_video_frame_rate () const -{ - { - boost::mutex::scoped_lock lm (_mutex); - if (_audio_video_frame_rate) { - return _audio_video_frame_rate.get (); - } - } - - /* No frame rate specified, so assume this content has been - prepared for any concurrent video content. - */ - return film()->active_frame_rate_change(position()).source; -} - AudioContent::set_streams (vector streams) { { @@ -360,7 +335,7 @@ AudioContent::set_streams (vector streams) _streams = streams; } - _parent->signal_changed (AudioContentProperty::AUDIO_STREAMS); + _parent->signal_changed (AudioContentProperty::STREAMS); } AudioStreamPtr @@ -379,7 +354,7 @@ AudioContent::add_stream (AudioStreamPtr stream) _streams.push_back (stream); } - _parent->signal_changed (AudioContentProperty::AUDIO_STREAMS); + _parent->signal_changed (AudioContentProperty::STREAMS); } void @@ -391,5 +366,5 @@ AudioContent::set_stream (AudioStreamPtr stream) _streams.push_back (stream); } - _parent->signal_changed (AudioContentProperty::AUDIO_STREAMS); + _parent->signal_changed (AudioContentProperty::STREAMS); }