diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-12-20 21:28:47 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-12-20 21:28:47 +0000 |
| commit | a5b59faff75265d3256ad0dbd9f0c69e51e31ce4 (patch) | |
| tree | c004aa04bcccff1ef8cf0d9f0a8f00c4da8831e0 /src/lib/audio_content.cc | |
| parent | 9b21d77dccc88d9b77085e05845e0b8e2d606b3b (diff) | |
| parent | 13b133de7fb5b953c23c58790c2d1f2a8bf4009c (diff) | |
Merge branch '1.0' into 1.0-seek
Diffstat (limited to 'src/lib/audio_content.cc')
| -rw-r--r-- | src/lib/audio_content.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index de743571b..83a43f3bd 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -23,6 +23,7 @@ #include "job_manager.h" #include "film.h" #include "exceptions.h" +#include "config.h" #include "i18n.h" @@ -42,7 +43,7 @@ int const AudioContentProperty::AUDIO_MAPPING = 205; AudioContent::AudioContent (shared_ptr<const Film> f, DCPTime s) : Content (f, s) , _audio_gain (0) - , _audio_delay (0) + , _audio_delay (Config::instance()->default_audio_delay ()) { } @@ -50,7 +51,7 @@ AudioContent::AudioContent (shared_ptr<const Film> f, DCPTime s) AudioContent::AudioContent (shared_ptr<const Film> f, boost::filesystem::path p) : Content (f, p) , _audio_gain (0) - , _audio_delay (0) + , _audio_delay (Config::instance()->default_audio_delay ()) { } |