projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak formatting.
[dcpomatic.git]
/
src
/
lib
/
audio_content.h
diff --git
a/src/lib/audio_content.h
b/src/lib/audio_content.h
index e196e15c208e6573441c8c3de736c1d31089e4a3..963f759e82fd68e260ab5a7f7f4d16566573cf82 100644
(file)
--- a/
src/lib/audio_content.h
+++ b/
src/lib/audio_content.h
@@
-1,33
+1,38
@@
/*
/*
- Copyright (C) 2013-20
16
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
- 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.
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
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 <http://www.gnu.org/licenses/>.
*/
*/
+
/** @file src/lib/audio_content.h
* @brief AudioContent and AudioContentProperty classes.
*/
/** @file src/lib/audio_content.h
* @brief AudioContent and AudioContentProperty classes.
*/
+
#ifndef DCPOMATIC_AUDIO_CONTENT_H
#define DCPOMATIC_AUDIO_CONTENT_H
#ifndef DCPOMATIC_AUDIO_CONTENT_H
#define DCPOMATIC_AUDIO_CONTENT_H
+
#include "content_part.h"
#include "audio_stream.h"
#include "audio_mapping.h"
#include "content_part.h"
#include "audio_stream.h"
#include "audio_mapping.h"
+
/** @class AudioContentProperty
* @brief Names for properties of AudioContent.
*/
/** @class AudioContentProperty
* @brief Names for properties of AudioContent.
*/
@@
-39,22
+44,27
@@
public:
static int const DELAY;
};
static int const DELAY;
};
+
class AudioContent : public ContentPart
{
public:
class AudioContent : public ContentPart
{
public:
- AudioContent (Content* parent, boost::shared_ptr<const Film>);
- AudioContent (Content* parent, boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
+ explicit AudioContent (Content* parent);
+ AudioContent (Content* parent, std::vector<std::shared_ptr<Content>>);
+ AudioContent (Content* parent, cxml::ConstNodePtr);
void as_xml (xmlpp::Node *) const;
std::string technical_summary () const;
void as_xml (xmlpp::Node *) const;
std::string technical_summary () const;
+ void take_settings_from (std::shared_ptr<const AudioContent> c);
AudioMapping mapping () const;
void set_mapping (AudioMapping);
AudioMapping mapping () const;
void set_mapping (AudioMapping);
- int resampled_frame_rate () const;
- bool has_rate_above_48k () const;
- std::vector<std::string> channel_names () const;
+ int resampled_frame_rate (std::shared_ptr<const Film> film) const;
+ std::vector<NamedChannel> channel_names () const;
- void set_gain (double);
+ /** Set gain in dB.
+ * @param double g New gain in dB.
+ */
+ void set_gain (double g);
void set_delay (int);
double gain () const {
void set_delay (int);
double gain () const {
@@
-67,7
+77,7
@@
public:
return _delay;
}
return _delay;
}
- std::string processing_description () const;
+ std::string processing_description (
std::shared_ptr<const Film> film
) const;
std::vector<AudioStreamPtr> streams () const {
boost::mutex::scoped_lock lm (_mutex);
std::vector<AudioStreamPtr> streams () const {
boost::mutex::scoped_lock lm (_mutex);
@@
-79,18
+89,19
@@
public:
void set_streams (std::vector<AudioStreamPtr> streams);
AudioStreamPtr stream () const;
void set_streams (std::vector<AudioStreamPtr> streams);
AudioStreamPtr stream () const;
- void add_properties (std::list<UserProperty> &) const;
+ void add_properties (std::
shared_ptr<const Film> film, std::
list<UserProperty> &) const;
- static boost::shared_ptr<AudioContent> from_xml (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr);
+ void modify_position (std::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
+ void modify_trim_start (dcpomatic::ContentTime& pos) const;
-private:
+ static std::shared_ptr<AudioContent> from_xml (Content* parent, cxml::ConstNodePtr, int version);
- AudioContent (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr);
+private:
/** Gain to apply to audio in dB */
/** Gain to apply to audio in dB */
- double _gain;
+ double _gain
= 0
;
/** Delay to apply to audio (positive moves audio later) in milliseconds */
/** Delay to apply to audio (positive moves audio later) in milliseconds */
- int _delay;
+ int _delay
= 0
;
std::vector<AudioStreamPtr> _streams;
};
std::vector<AudioStreamPtr> _streams;
};