diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-02 15:12:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-02 15:12:00 +0100 |
| commit | c157cd97740a2ba55d3e87bd9844429cc7d49ce7 (patch) | |
| tree | a27db11e3df078ef35b980ffe26f54152657932e /src/lib/film.cc | |
| parent | 0a93237cb5e4642d3b698ff9b7d0cfae5401478c (diff) | |
Apply single-processor branch manually; processor is now in Film, not AudioContent.
Diffstat (limited to 'src/lib/film.cc')
| -rw-r--r-- | src/lib/film.cc | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index edcb124e5..0e55ec1d3 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -41,6 +41,7 @@ #include "safe_stringstream.h" #include "environment_info.h" #include "raw_convert.h" +#include "audio_processor.h" #include <libcxml/cxml.h> #include <dcp/cpl.h> #include <dcp/signer.h> @@ -126,6 +127,7 @@ Film::Film (boost::filesystem::path dir, bool log) , _sequence_video (true) , _interop (false) , _burn_subtitles (false) + , _audio_processor (0) , _state_version (current_state_version) , _dirty (false) { @@ -328,6 +330,9 @@ Film::metadata () const root->add_child("Signed")->add_child_text (_signed ? "1" : "0"); root->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0"); root->add_child("Key")->add_child_text (_key.hex ()); + if (_audio_processor) { + root->add_child("AudioProcessor")->add_child_text (_audio_processor->id ()); + } _playlist->as_xml (root->add_child ("Playlist")); return doc; @@ -408,6 +413,12 @@ Film::read_metadata () } _key = dcp::Key (f.string_child ("Key")); + if (f.optional_string_child ("AudioProcessor")) { + _audio_processor = AudioProcessor::from_id (f.string_child ("AudioProcessor")); + } else { + _audio_processor = 0; + } + list<string> notes; /* This method is the only one that can return notes (so far) */ _playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"), _state_version, notes); @@ -770,6 +781,13 @@ Film::set_burn_subtitles (bool b) } void +Film::set_audio_processor (AudioProcessor const * processor) +{ + _audio_processor = processor; + signal_changed (AUDIO_PROCESSOR); +} + +void Film::signal_changed (Property p) { _dirty = true; |