Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

6 files changed, 16 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index cf10f5714..a2c06d5be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,5 @@ test/README.aux
 .flatpak-builder
 src/wx/supporters.cc
 src/wx/subscribers.cc
+.ccls-cache
+
diff --git a/cscript b/cscript
index a7dd0282e..013b10029 100644
--- a/cscript
+++ b/cscript
@@ -376,8 +376,8 @@ def dependencies(target):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.6.8'))
-    deps.append(('libsub', 'v1.4.10'))
+    deps.append(('libdcp', 'v1.6.9'))
+    deps.append(('libsub', 'v1.4.11'))
     deps.append(('rtaudio-cdist', 'bf0fc23'))
 
     return deps
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index d7aaade8c..5b9f187f1 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -244,6 +244,7 @@ EOF
     DeRez -only icns "$appdir/Contents/Resources/dcpomatic2.icns" > "$appdir/Contents/Resources/DCP-o-matic.rsrc"
     Rez -append "$appdir/Contents/Resources/DCP-o-matic.rsrc" -o "$dmg"
     SetFile -a C "$dmg"
+    xattr -c "$dmg"
     codesign --verify --verbose --sign "Developer ID Application: Carl Hetherington (R82DXSR997)" "$dmg"
     if [ "$?" != "0" ]; then
 	echo "Failed to sign .dmg"
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 38c4beaae..cc8556f3d 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -636,7 +636,11 @@ Player::pass ()
 			/* Sometimes the thing that happened last finishes fractionally before
 			   or after this silence.  Bodge the start time of the silence to fix it.
 			*/
-			DCPOMATIC_ASSERT (labs(period.from.get() - _last_audio_time->get()) < 2);
+			int64_t const error = labs(period.from.get() - _last_audio_time->get());
+			if (error >= 2) {
+				_film->log()->log(String::compose("Silence starting before or after last audio by %1", error), LogEntry::TYPE_ERROR);
+			}
+			DCPOMATIC_ASSERT (error < 2);
 			period.from = *_last_audio_time;
 		}
 		if (period.duration() > one_video_frame()) {
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index f10815ca4..d3bdc923d 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -404,7 +404,6 @@ TimingPanel::trim_start_changed ()
 	optional<FrameRateChange> ref_frc;
 	optional<DCPTime> ref_ph;
 
-	ContentTime const trim = _trim_start->get (_parent->film()->video_frame_rate ());
 
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
 		if (i->position() <= ph && ph < i->end(_parent->film())) {
@@ -417,6 +416,7 @@ TimingPanel::trim_start_changed ()
 			ref_ph = ph - i->position() + DCPTime (i->trim_start(), ref_frc.get());
 		}
 
+		ContentTime const trim = _trim_start->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate()));
 		i->set_trim_start (trim);
 	}
 
@@ -437,8 +437,8 @@ TimingPanel::trim_end_changed ()
 
 	fv->set_coalesce_player_changes (true);
 
-	ContentTime const trim = _trim_end->get (_parent->film()->video_frame_rate ());
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
+		ContentTime const trim = _trim_end->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate()));
 		i->set_trim_end (trim);
 	}
 
diff --git a/wscript b/wscript
index c6bcba56a..70a7c5939 100644
--- a/wscript
+++ b/wscript
@@ -305,21 +305,21 @@ def configure(conf):
 
     # libdcp
     if conf.options.static_dcp:
-        conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.8', args='--cflags', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.9', args='--cflags', uselib_store='DCP', mandatory=True)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
         conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-cth', 'kumu-cth', 'openjp2']
         conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
     else:
-        conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.8', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.9', args='--cflags --libs', uselib_store='DCP', mandatory=True)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
 
     # libsub
     if conf.options.static_sub:
-        conf.check_cfg(package='libsub-1.0', atleast_version='1.4.10', args='--cflags', uselib_store='SUB', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version='1.4.11', args='--cflags', uselib_store='SUB', mandatory=True)
         conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
         conf.env.STLIB_SUB = ['sub-1.0']
     else:
-        conf.check_cfg(package='libsub-1.0', atleast_version='1.4.10', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version='1.4.11', args='--cflags --libs', uselib_store='SUB', mandatory=True)
         conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
 
     # libxml++