dcpomatic.git
9 years agoMerge master.
Carl Hetherington [Wed, 6 Aug 2014 14:37:57 +0000 (15:37 +0100)]
Merge master.

9 years agoTweak.
Carl Hetherington [Wed, 6 Aug 2014 12:23:15 +0000 (13:23 +0100)]
Tweak.

9 years agoManual tweak.
Carl Hetherington [Tue, 5 Aug 2014 14:16:45 +0000 (15:16 +0100)]
Manual tweak.

9 years agoRPM fixes.
Carl Hetherington [Mon, 4 Aug 2014 22:28:25 +0000 (23:28 +0100)]
RPM fixes.

9 years agoRPM fixes.
Carl Hetherington [Mon, 4 Aug 2014 21:48:43 +0000 (22:48 +0100)]
RPM fixes.

9 years agoMore RPM tweaks.
Carl Hetherington [Mon, 4 Aug 2014 20:02:13 +0000 (21:02 +0100)]
More RPM tweaks.

9 years agoMore RPM tweaks.
Carl Hetherington [Mon, 4 Aug 2014 19:20:42 +0000 (20:20 +0100)]
More RPM tweaks.

9 years agoMore RPM tweaks.
Carl Hetherington [Mon, 4 Aug 2014 18:37:55 +0000 (19:37 +0100)]
More RPM tweaks.

9 years agocdist fix.
Carl Hetherington [Mon, 4 Aug 2014 17:52:31 +0000 (18:52 +0100)]
cdist fix.

9 years agocdist fix.
Carl Hetherington [Mon, 4 Aug 2014 17:40:37 +0000 (18:40 +0100)]
cdist fix.

9 years agoTypo in previous.
Carl Hetherington [Mon, 4 Aug 2014 13:26:23 +0000 (14:26 +0100)]
Typo in previous.

9 years agocdist fix.
Carl Hetherington [Mon, 4 Aug 2014 13:24:18 +0000 (14:24 +0100)]
cdist fix.

9 years agoAdd KDM BCC email option.
Carl Hetherington [Mon, 4 Aug 2014 13:10:31 +0000 (14:10 +0100)]
Add KDM BCC email option.

9 years agocdist updates.
Carl Hetherington [Mon, 4 Aug 2014 12:50:51 +0000 (13:50 +0100)]
cdist updates.

9 years agoSupporter.
Carl Hetherington [Mon, 4 Aug 2014 12:27:17 +0000 (13:27 +0100)]
Supporter.

9 years agocscript fix.
Carl Hetherington [Sat, 2 Aug 2014 15:32:06 +0000 (16:32 +0100)]
cscript fix.

9 years agoBump deps for cscript fixes.
Carl Hetherington [Sat, 2 Aug 2014 15:21:06 +0000 (16:21 +0100)]
Bump deps for cscript fixes.

9 years agoBump version
Carl Hetherington [Tue, 29 Jul 2014 22:33:50 +0000 (23:33 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Tue, 29 Jul 2014 22:33:50 +0000 (23:33 +0100)]
Bump version

9 years agoSupporter.
Carl Hetherington [Tue, 29 Jul 2014 21:50:59 +0000 (22:50 +0100)]
Supporter.

9 years agoTweak.
Carl Hetherington [Fri, 25 Jul 2014 20:47:58 +0000 (21:47 +0100)]
Tweak.

9 years agoTweak.
Carl Hetherington [Fri, 25 Jul 2014 20:17:12 +0000 (21:17 +0100)]
Tweak.

9 years agoOS X hacks.
Carl Hetherington [Fri, 25 Jul 2014 19:51:01 +0000 (20:51 +0100)]
OS X hacks.

9 years agoOS X build hack.
Carl Hetherington [Fri, 25 Jul 2014 19:10:46 +0000 (20:10 +0100)]
OS X build hack.

9 years agoRevert bad OS X build change.
Carl Hetherington [Fri, 25 Jul 2014 13:07:51 +0000 (14:07 +0100)]
Revert bad OS X build change.

9 years agoComment tweak.
Carl Hetherington [Fri, 25 Jul 2014 10:25:58 +0000 (11:25 +0100)]
Comment tweak.

9 years agoDiagram tweaks.
Carl Hetherington [Fri, 25 Jul 2014 10:23:47 +0000 (11:23 +0100)]
Diagram tweaks.

9 years agoAdd audio path documentation.
Carl Hetherington [Fri, 25 Jul 2014 10:18:39 +0000 (11:18 +0100)]
Add audio path documentation.

9 years agoOS X build debugging.
Carl Hetherington [Fri, 25 Jul 2014 08:31:53 +0000 (09:31 +0100)]
OS X build debugging.

9 years agoPut some get/sets in FFmpegAudioStream.
Carl Hetherington [Fri, 25 Jul 2014 08:25:09 +0000 (09:25 +0100)]
Put some get/sets in FFmpegAudioStream.

9 years agocp parameter mistake.
Carl Hetherington [Fri, 25 Jul 2014 07:33:55 +0000 (08:33 +0100)]
cp parameter mistake.

9 years agoRemove unused variable.
Carl Hetherington [Thu, 24 Jul 2014 23:48:22 +0000 (00:48 +0100)]
Remove unused variable.

9 years agoCrash fix.
Carl Hetherington [Thu, 24 Jul 2014 23:24:23 +0000 (00:24 +0100)]
Crash fix.

9 years agoVarious attempted OS X fixes.
Carl Hetherington [Thu, 24 Jul 2014 23:23:35 +0000 (00:23 +0100)]
Various attempted OS X fixes.

9 years agoMore OS X build hacks.
Carl Hetherington [Thu, 24 Jul 2014 17:45:15 +0000 (18:45 +0100)]
More OS X build hacks.

9 years agoMore OS X build fixes
Carl Hetherington [Thu, 24 Jul 2014 13:08:45 +0000 (14:08 +0100)]
More OS X build fixes

9 years ago#include trimming.
Carl Hetherington [Wed, 23 Jul 2014 10:47:05 +0000 (11:47 +0100)]
#include trimming.

9 years agoRemove seemingly unnecessary stream description in audio panel; tidy layout a bit.
Carl Hetherington [Wed, 23 Jul 2014 10:31:23 +0000 (11:31 +0100)]
Remove seemingly unnecessary stream description in audio panel; tidy layout a bit.

9 years agoMerge branch '1.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Carl Hetherington [Wed, 23 Jul 2014 09:40:26 +0000 (10:40 +0100)]
Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

9 years agoDisable player controls when there is no content.
Carl Hetherington [Wed, 23 Jul 2014 09:39:20 +0000 (10:39 +0100)]
Disable player controls when there is no content.

9 years agoReinstate AudioDecoder::flush().
Carl Hetherington [Wed, 23 Jul 2014 09:09:08 +0000 (10:09 +0100)]
Reinstate AudioDecoder::flush().

9 years agoFix excessive memory usage on long plays without audio.
Carl Hetherington [Wed, 23 Jul 2014 09:06:24 +0000 (10:06 +0100)]
Fix excessive memory usage on long plays without audio.

9 years agoDMG build hack.
Carl Hetherington [Wed, 23 Jul 2014 07:46:05 +0000 (08:46 +0100)]
DMG build hack.

9 years agoFix make_dmg a little.
Carl Hetherington [Tue, 22 Jul 2014 23:12:27 +0000 (00:12 +0100)]
Fix make_dmg a little.

9 years agoFix some warnings.
Carl Hetherington [Tue, 22 Jul 2014 22:26:32 +0000 (23:26 +0100)]
Fix some warnings.

9 years agoWarning fixes.
Carl Hetherington [Tue, 22 Jul 2014 21:21:29 +0000 (22:21 +0100)]
Warning fixes.

9 years agoRemove some debug code.
Carl Hetherington [Tue, 22 Jul 2014 21:21:11 +0000 (22:21 +0100)]
Remove some debug code.

9 years agoBump ffmpeg.
Carl Hetherington [Tue, 22 Jul 2014 19:05:08 +0000 (20:05 +0100)]
Bump ffmpeg.

9 years agoMerge branch '0.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Carl Hetherington [Tue, 22 Jul 2014 18:52:49 +0000 (19:52 +0100)]
Merge branch '0.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

9 years agoChange cscript for newer cdist.
Carl Hetherington [Tue, 22 Jul 2014 18:52:44 +0000 (19:52 +0100)]
Change cscript for newer cdist.

9 years agoMissing OS X lib.
Carl Hetherington [Tue, 22 Jul 2014 17:12:28 +0000 (18:12 +0100)]
Missing OS X lib.

9 years agoMore dcpomatic2 stuff.
Carl Hetherington [Tue, 22 Jul 2014 15:44:17 +0000 (16:44 +0100)]
More dcpomatic2 stuff.

9 years agoOption to draw a border around the content's image (#391).
Carl Hetherington [Tue, 22 Jul 2014 15:32:37 +0000 (16:32 +0100)]
Option to draw a border around the content's image (#391).

9 years agoOS X fixes.
Carl Hetherington [Tue, 22 Jul 2014 15:09:01 +0000 (16:09 +0100)]
OS X fixes.

9 years agoSomewhat speculative move to allow -ve seeks, which seem to be necessary for some...
Carl Hetherington [Tue, 22 Jul 2014 13:47:30 +0000 (14:47 +0100)]
Somewhat speculative move to allow -ve seeks, which seem to be necessary for some files to seek correctly to 0.

9 years agoFix test.
Carl Hetherington [Tue, 22 Jul 2014 13:47:09 +0000 (14:47 +0100)]
Fix test.

9 years agoVarious OS X build fixes.
Carl Hetherington [Tue, 22 Jul 2014 13:20:28 +0000 (14:20 +0100)]
Various OS X build fixes.

9 years agoAnother comment.
Carl Hetherington [Tue, 22 Jul 2014 12:26:29 +0000 (13:26 +0100)]
Another comment.

9 years agoAdd a comment.
Carl Hetherington [Tue, 22 Jul 2014 12:16:12 +0000 (13:16 +0100)]
Add a comment.

9 years agoMore OS X fixes.
Carl Hetherington [Tue, 22 Jul 2014 12:13:48 +0000 (13:13 +0100)]
More OS X fixes.

9 years agoFix crash.
Carl Hetherington [Tue, 22 Jul 2014 10:59:49 +0000 (11:59 +0100)]
Fix crash.

9 years agoInitial cut at import dcp test.
Carl Hetherington [Tue, 22 Jul 2014 10:54:54 +0000 (11:54 +0100)]
Initial cut at import dcp test.

9 years agoFix to OS X build script.
Carl Hetherington [Tue, 22 Jul 2014 10:33:45 +0000 (11:33 +0100)]
Fix to OS X build script.

9 years agoWrite subtitle intrinsic durations to match the picture in the reel; sort out test...
Carl Hetherington [Tue, 22 Jul 2014 10:27:55 +0000 (11:27 +0100)]
Write subtitle intrinsic durations to match the picture in the reel; sort out test fiasco after making libdcp compare DCPs properly again.

9 years agoAdapt to changes in libdcp1 wrt shared_ptr and Certificate.
Carl Hetherington [Mon, 21 Jul 2014 15:53:58 +0000 (16:53 +0100)]
Adapt to changes in libdcp1 wrt shared_ptr and Certificate.

9 years agoVideo hash changed for reasons unknown.
Carl Hetherington [Mon, 21 Jul 2014 12:49:31 +0000 (13:49 +0100)]
Video hash changed for reasons unknown.

9 years agoSave KDMs for imported DCPs to metadata.xml.
Carl Hetherington [Sun, 20 Jul 2014 23:19:42 +0000 (00:19 +0100)]
Save KDMs for imported DCPs to metadata.xml.

9 years agoBasic support for decryption of imported DCPs.
Carl Hetherington [Sun, 20 Jul 2014 20:22:52 +0000 (21:22 +0100)]
Basic support for decryption of imported DCPs.

9 years agoTry to fix v2 markers in OS X / Windows install scripts.
Carl Hetherington [Sat, 19 Jul 2014 20:02:09 +0000 (21:02 +0100)]
Try to fix v2 markers in OS X / Windows install scripts.

9 years agoAttempt to cope with dcpomatic -> dcpomatic2
Carl Hetherington [Fri, 18 Jul 2014 23:39:32 +0000 (00:39 +0100)]
Attempt to cope with dcpomatic -> dcpomatic2

9 years agoFix build.
Carl Hetherington [Fri, 18 Jul 2014 23:16:02 +0000 (00:16 +0100)]
Fix build.

9 years agoFix build.
Carl Hetherington [Fri, 18 Jul 2014 23:12:15 +0000 (00:12 +0100)]
Fix build.

9 years agoFix ffmpeg revision.
Carl Hetherington [Fri, 18 Jul 2014 13:58:11 +0000 (14:58 +0100)]
Fix ffmpeg revision.

9 years agoMake 2.0 branch parallel installable with 1.x.
Carl Hetherington [Fri, 18 Jul 2014 13:22:19 +0000 (14:22 +0100)]
Make 2.0 branch parallel installable with 1.x.

9 years agoAdd some test data.
Carl Hetherington [Fri, 18 Jul 2014 12:21:28 +0000 (13:21 +0100)]
Add some test data.

9 years agoAdd DCP subtitle file.
Carl Hetherington [Fri, 18 Jul 2014 12:21:20 +0000 (13:21 +0100)]
Add DCP subtitle file.

9 years agoBump ffmpeg.
Carl Hetherington [Fri, 18 Jul 2014 12:20:37 +0000 (13:20 +0100)]
Bump ffmpeg.

9 years agoKeep signing certificates / keys in config.xml rather than on disk; allow configuration.
Carl Hetherington [Fri, 18 Jul 2014 12:12:41 +0000 (13:12 +0100)]
Keep signing certificates / keys in config.xml rather than on disk; allow configuration.

9 years agoSwap icons around a bit.
Carl Hetherington [Fri, 18 Jul 2014 12:11:50 +0000 (13:11 +0100)]
Swap icons around a bit.

9 years agoMerge master.
Carl Hetherington [Thu, 17 Jul 2014 09:45:16 +0000 (10:45 +0100)]
Merge master.

9 years agoMissing std_to_wx().
Carl Hetherington [Thu, 17 Jul 2014 09:36:05 +0000 (10:36 +0100)]
Missing std_to_wx().

Reported-by: Carsten Kurz
9 years agoSpeculative fix for failure to keep the computer awake during encodes on Windows.
Carl Hetherington [Thu, 17 Jul 2014 08:57:24 +0000 (09:57 +0100)]
Speculative fix for failure to keep the computer awake during encodes on Windows.

9 years agoBump version
Carl Hetherington [Wed, 16 Jul 2014 16:10:58 +0000 (16:10 +0000)]
Bump version

9 years agoBump version
Carl Hetherington [Wed, 16 Jul 2014 16:10:58 +0000 (16:10 +0000)]
Bump version

9 years agoMerge master.
Carl Hetherington [Wed, 16 Jul 2014 16:10:47 +0000 (17:10 +0100)]
Merge master.

9 years agoAttempted 64-bit compile fix.
Carl Hetherington [Wed, 16 Jul 2014 16:09:33 +0000 (17:09 +0100)]
Attempted 64-bit compile fix.

9 years agoMerge remote-tracking branch 'origin/master' into 1.0
Carl Hetherington [Wed, 16 Jul 2014 16:02:25 +0000 (17:02 +0100)]
Merge remote-tracking branch 'origin/master' into 1.0

9 years agoChangeLog.
Carl Hetherington [Wed, 16 Jul 2014 16:02:14 +0000 (17:02 +0100)]
ChangeLog.

9 years agoAdd default scaling setting to preferences (#384).
Carl Hetherington [Wed, 16 Jul 2014 16:01:46 +0000 (17:01 +0100)]
Add default scaling setting to preferences (#384).

9 years agoMerge master.
Carl Hetherington [Wed, 16 Jul 2014 14:30:32 +0000 (15:30 +0100)]
Merge master.

9 years agoBump version
Carl Hetherington [Wed, 16 Jul 2014 14:26:32 +0000 (14:26 +0000)]
Bump version

9 years agoBump version
Carl Hetherington [Wed, 16 Jul 2014 14:26:32 +0000 (14:26 +0000)]
Bump version

9 years agoTry to include wxWidgets .mo files in .dmg.
Carl Hetherington [Wed, 16 Jul 2014 14:22:56 +0000 (15:22 +0100)]
Try to include wxWidgets .mo files in .dmg.

9 years agoChangeLog.
Carl Hetherington [Wed, 16 Jul 2014 14:22:32 +0000 (15:22 +0100)]
ChangeLog.

9 years agoImprove approximate time reporting a bit (#383).
Carl Hetherington [Wed, 16 Jul 2014 14:21:56 +0000 (15:21 +0100)]
Improve approximate time reporting a bit (#383).

9 years agoi18n tweaks for untranslated alternative-enabled stuff.
Carl Hetherington [Wed, 16 Jul 2014 13:53:00 +0000 (14:53 +0100)]
i18n tweaks for untranslated alternative-enabled stuff.

9 years agoMerge remote-tracking branch 'origin/master' into 2.0
Carl Hetherington [Wed, 16 Jul 2014 13:30:02 +0000 (14:30 +0100)]
Merge remote-tracking branch 'origin/master' into 2.0

9 years agoAllow $CPL_NAME etc. in KDM email subjects. Add de_DE translation of
Carl Hetherington [Wed, 16 Jul 2014 13:28:36 +0000 (14:28 +0100)]
Allow $CPL_NAME etc. in KDM email subjects.  Add de_DE translation of
default subject.

Suggested-by: Carsten Kurz
9 years agoPot merge.
Carl Hetherington [Wed, 16 Jul 2014 12:57:28 +0000 (13:57 +0100)]
Pot merge.

9 years agoMake KDM email subject configurable.
Carl Hetherington [Wed, 16 Jul 2014 12:56:42 +0000 (13:56 +0100)]
Make KDM email subject configurable.

Suggested-by: Carsten Kurz