projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move luminance to Interop/SMPTE metadata and remove the ISDCF metadata dialogue.
[dcpomatic.git]
/
src
/
lib
/
audio_content.h
diff --git
a/src/lib/audio_content.h
b/src/lib/audio_content.h
index a1f5ba8a0aecbe05b8c6d6b450fdb54dfbe15f80..adb5c9556151e0aa02d876374042e8b6cd3f2b8b 100644
(file)
--- a/
src/lib/audio_content.h
+++ b/
src/lib/audio_content.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
16
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,16
+18,21
@@
*/
*/
+
/** @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"
+#include <dcp/language_tag.h>
+
/** @class AudioContentProperty
* @brief Names for properties of AudioContent.
/** @class AudioContentProperty
* @brief Names for properties of AudioContent.
@@
-38,26
+43,29
@@
public:
static int const STREAMS;
static int const GAIN;
static int const DELAY;
static int const STREAMS;
static int const GAIN;
static int const DELAY;
+ static int const LANGUAGE;
};
};
+
class AudioContent : public ContentPart
{
public:
explicit AudioContent (Content* parent);
class AudioContent : public ContentPart
{
public:
explicit AudioContent (Content* parent);
- AudioContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
+ 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 (
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 () 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);
void set_delay (int);
void set_gain (double);
void set_delay (int);
+ void set_language (boost::optional<dcp::LanguageTag> langauge);
double gain () const {
boost::mutex::scoped_lock lm (_mutex);
double gain () const {
boost::mutex::scoped_lock lm (_mutex);
@@
-69,7
+77,12
@@
public:
return _delay;
}
return _delay;
}
- std::string processing_description () const;
+ boost::optional<dcp::LanguageTag> language () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _language;
+ }
+
+ 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);
@@
-81,19
+94,21
@@
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, cxml::ConstNodePtr, int version);
+ 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, 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;
+ boost::optional<dcp::LanguageTag> _language;
};
#endif
};
#endif