diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-01 22:40:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-01 22:40:49 +0100 |
| commit | 744d20add3a3be77b9424fd73e9dcd8b146fc23a (patch) | |
| tree | 2f53de17ee33518e114fbcc00cc8228e470f61dc /src | |
| parent | 3fa1dc2bc3d353692ea9b2cd9cdb685dd94b85f4 (diff) | |
| parent | 533443c335cbd8c3dc24591976e63003308aaf9a (diff) | |
Merge branch 'master' of ssh://houllier/home/carl/git/dvdomatic
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/film.cc | 2 | ||||
| -rw-r--r-- | src/lib/trimmer.cc | 7 | ||||
| -rw-r--r-- | src/tools/wscript | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 217673a7f..1d4d050bc 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -695,7 +695,7 @@ Film::read_metadata () _dirty = false; - _log->log (String::compose ("Loaded film with use_content_audio = %1", use_content_audio ())); + _log->log (String::compose ("Loaded film with use_content_audio = %1", _use_content_audio)); } libdcp::Size diff --git a/src/lib/trimmer.cc b/src/lib/trimmer.cc index 1ec9e2a5b..99f04793f 100644 --- a/src/lib/trimmer.cc +++ b/src/lib/trimmer.cc @@ -62,8 +62,15 @@ Trimmer::Trimmer ( the current set of regression tests). This could be removed if a) the regression tests are regenerated and b) I can work out what DCP length should be. + + There is also a problem whereby black video frames inserted + at the start of the output by the matcher are not taken into account, + so if black frames are inserted it means more gets trimmed off the + end than should be. Hack around this in similar fashion with the + _video_end = INT_MAX line. */ if (video_trim_end == 0) { + _video_end = INT_MAX; _audio_end = INT64_MAX; } } diff --git a/src/tools/wscript b/src/tools/wscript index 386aa452e..20a92cad2 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -16,6 +16,8 @@ def build(bld): for t in ['dvdomatic', 'dvdomatic_batch', 'servomatic_gui']: obj = bld(features = 'cxx cxxprogram') obj.uselib = 'DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS' + if bld.env.STATIC: + obj.uselib += ' GTK' obj.includes = ['..'] obj.use = ['libdvdomatic', 'libdvdomatic-wx'] obj.source = '%s.cc' % t |