projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
lib
/
audio_content.h
diff --git
a/src/lib/audio_content.h
b/src/lib/audio_content.h
index 504c2aecfffde3b2719eff1789babcd3639a010a..83a5e327e87c02c0da9f98d987269bd858e72f6d 100644
(file)
--- a/
src/lib/audio_content.h
+++ b/
src/lib/audio_content.h
@@
-44,16
+44,16
@@
class AudioContent : public ContentPart
{
public:
explicit AudioContent (Content* parent);
{
public:
explicit AudioContent (Content* parent);
- AudioContent (Content* parent, std::vector<
boost
::shared_ptr<Content> >);
+ AudioContent (Content* parent, std::vector<
std
::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);
+ 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 (
boost
::shared_ptr<const Film> film) 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);
void set_delay (int);
void set_gain (double);
void set_delay (int);
@@
-68,7
+68,7
@@
public:
return _delay;
}
return _delay;
}
- std::string processing_description (
boost
::shared_ptr<const Film> film) 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);
@@
-80,12
+80,12
@@
public:
void set_streams (std::vector<AudioStreamPtr> streams);
AudioStreamPtr stream () const;
void set_streams (std::vector<AudioStreamPtr> streams);
AudioStreamPtr stream () const;
- void add_properties (
boost
::shared_ptr<const Film> film, std::list<UserProperty> &) const;
+ void add_properties (
std
::shared_ptr<const Film> film, std::list<UserProperty> &) const;
- void modify_position (
boost
::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
+ void modify_position (
std
::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
void modify_trim_start (dcpomatic::ContentTime& pos) const;
void modify_trim_start (dcpomatic::ContentTime& pos) const;
- static
boost
::shared_ptr<AudioContent> from_xml (Content* parent, cxml::ConstNodePtr, int version);
+ static
std
::shared_ptr<AudioContent> from_xml (Content* parent, cxml::ConstNodePtr, int version);
private:
private: