projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put audio language back in the Film.
[dcpomatic.git]
/
src
/
lib
/
audio_content.h
diff --git
a/src/lib/audio_content.h
b/src/lib/audio_content.h
index adb5c9556151e0aa02d876374042e8b6cd3f2b8b..67183d0a45b517887ea0f4625894f2adaa1dfc33 100644
(file)
--- a/
src/lib/audio_content.h
+++ b/
src/lib/audio_content.h
@@
-31,7
+31,6
@@
#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
/** @class AudioContentProperty
@@
-43,7
+42,6
@@
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;
};
};
@@
-65,7
+63,6
@@
public:
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);
@@
-77,11
+74,6
@@
public:
return _delay;
}
return _delay;
}
- 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 {
std::string processing_description (std::shared_ptr<const Film> film) const;
std::vector<AudioStreamPtr> streams () const {
@@
-108,7
+100,6
@@
private:
/** Delay to apply to audio (positive moves audio later) in milliseconds */
int _delay = 0;
std::vector<AudioStreamPtr> _streams;
/** Delay to apply to audio (positive moves audio later) in milliseconds */
int _delay = 0;
std::vector<AudioStreamPtr> _streams;
- boost::optional<dcp::LanguageTag> _language;
};
#endif
};
#endif