Merge master.

[dcpomatic.git] / src / lib / audio_content.cc

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index de743571bf218b7e747b7792b46a057aa0965918..3c0d13ba93c1b98b5bbd1760f33ecc16c38786db 100644 (file)
--- 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 ())
 {
 
 }
@@ -156,7 +157,7 @@ AudioContent::technical_summary () const
  *  @param at The time within the DCP to get the active frame rate change from; i.e. a point at which
  *  the `controlling' video content is active.
  */
-AudioContent::Frame
+AudioFrame
 AudioContent::time_to_content_audio_frames (DCPTime t, DCPTime at) const
 {
        shared_ptr<const Film> film = _film.lock ();