projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Take Film pointer out of Content.
[dcpomatic.git]
/
src
/
lib
/
audio_content.h
diff --git
a/src/lib/audio_content.h
b/src/lib/audio_content.h
index e196e15c208e6573441c8c3de736c1d31089e4a3..051fc8db8941f137fdd54d90f457dd709204aa42 100644
(file)
--- a/
src/lib/audio_content.h
+++ b/
src/lib/audio_content.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-2016 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/>.
*/
*/
@@
-42,15
+43,16
@@
public:
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<boost::shared_ptr<Content> >);
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 (boost::shared_ptr<const AudioContent> c);
AudioMapping mapping () const;
void set_mapping (AudioMapping);
AudioMapping mapping () const;
void set_mapping (AudioMapping);
- int resampled_frame_rate () const;
+ int resampled_frame_rate (
boost::shared_ptr<const Film> film
) const;
bool has_rate_above_48k () const;
std::vector<std::string> channel_names () const;
bool has_rate_above_48k () const;
std::vector<std::string> channel_names () const;
@@
-67,7
+69,7
@@
public:
return _delay;
}
return _delay;
}
- std::string processing_description () const;
+ std::string processing_description (
boost::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,13
+81,16
@@
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 (boost::shared_ptr<const Film> film, std::list<UserProperty> &) const;
+
+ void modify_position (boost::shared_ptr<const Film> film, DCPTime& pos) const;
+ void modify_trim_start (ContentTime& pos) const;
- static boost::shared_ptr<AudioContent> from_xml (Content* parent,
boost::shared_ptr<const Film>, cxml::ConstNodePtr
);
+ static boost::shared_ptr<AudioContent> from_xml (Content* parent,
cxml::ConstNodePtr, int version
);
private:
private:
- AudioContent (Content* parent,
boost::shared_ptr<const Film>,
cxml::ConstNodePtr);
+ AudioContent (Content* parent, cxml::ConstNodePtr);
/** Gain to apply to audio in dB */
double _gain;
/** Gain to apply to audio in dB */
double _gain;