dcpomatic.git
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
9 years agoMissing virtual destructor.
Carl Hetherington [Wed, 16 Jul 2014 12:31:59 +0000 (13:31 +0100)]
Missing virtual destructor.

9 years agoMissing virtual destructor.
Carl Hetherington [Wed, 16 Jul 2014 10:55:24 +0000 (11:55 +0100)]
Missing virtual destructor.

9 years agoFix mis-merge.
Carl Hetherington [Wed, 16 Jul 2014 10:35:49 +0000 (11:35 +0100)]
Fix mis-merge.

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

9 years agoTry to include wxWidgets .mo files in the Windows installer.
Carl Hetherington [Wed, 16 Jul 2014 09:49:23 +0000 (10:49 +0100)]
Try to include wxWidgets .mo files in the Windows installer.

9 years agoUpdates to de_DE.
Carl Hetherington [Wed, 16 Jul 2014 09:32:24 +0000 (10:32 +0100)]
Updates to de_DE.

Signed-off-by: Carsten Kurz
9 years agoLimit KDM types depending on DCP standard.
Carl Hetherington [Wed, 16 Jul 2014 09:30:57 +0000 (10:30 +0100)]
Limit KDM types depending on DCP standard.

9 years agoUpdates to fr_FR from Grégoire Ausina.
Carl Hetherington [Wed, 16 Jul 2014 08:57:06 +0000 (09:57 +0100)]
Updates to fr_FR from Grégoire Ausina.

Signed-off-by: Grégoire Ausina
9 years agoMerge centos-hacks,.
Carl Hetherington [Tue, 15 Jul 2014 16:52:05 +0000 (17:52 +0100)]
Merge centos-hacks,.

9 years agoMore centos build fixes.
Carl Hetherington [Mon, 14 Jul 2014 10:53:57 +0000 (11:53 +0100)]
More centos build fixes.

9 years agoBump libdcp for <Hash> in CPLs.
Carl Hetherington [Mon, 14 Jul 2014 10:41:10 +0000 (11:41 +0100)]
Bump libdcp for <Hash> in CPLs.

9 years agoCentos build fixes.
Carl Hetherington [Sun, 13 Jul 2014 21:35:46 +0000 (22:35 +0100)]
Centos build fixes.

9 years agoChangeLog.
Carl Hetherington [Tue, 15 Jul 2014 12:42:15 +0000 (13:42 +0100)]
ChangeLog.

9 years agoComplete upmixer A test.
Carl Hetherington [Tue, 15 Jul 2014 12:33:15 +0000 (13:33 +0100)]
Complete upmixer A test.

9 years agoAdd simple stereo-5.1 upmixer.
Carl Hetherington [Tue, 15 Jul 2014 12:15:02 +0000 (13:15 +0100)]
Add simple stereo-5.1 upmixer.

9 years agoAdd basic windowed-sinc audio filters.
Carl Hetherington [Tue, 15 Jul 2014 09:28:06 +0000 (10:28 +0100)]
Add basic windowed-sinc audio filters.

9 years agoBump libdcp to get <Hash> tags in CPLs.
Carl Hetherington [Mon, 14 Jul 2014 10:41:50 +0000 (11:41 +0100)]
Bump libdcp to get <Hash> tags in CPLs.

9 years agoRemove support for (very) old config file format.
Carl Hetherington [Sun, 13 Jul 2014 21:01:31 +0000 (22:01 +0100)]
Remove support for (very) old config file format.

9 years agoRename SoundProcessor -> CinemaSoundProcessor.
Carl Hetherington [Sun, 13 Jul 2014 20:56:17 +0000 (21:56 +0100)]
Rename SoundProcessor -> CinemaSoundProcessor.

9 years agoVery basic audio processing framework.
Carl Hetherington [Sun, 13 Jul 2014 19:44:45 +0000 (20:44 +0100)]
Very basic audio processing framework.

9 years agoSeparate code for the content panel out into a separate class.
Carl Hetherington [Fri, 11 Jul 2014 14:06:52 +0000 (15:06 +0100)]
Separate code for the content panel out into a separate class.

9 years agoUpdate libdcp versioning.
Carl Hetherington [Sat, 12 Jul 2014 21:39:43 +0000 (22:39 +0100)]
Update libdcp versioning.

9 years agoFix subtitle panel enabling.
Carl Hetherington [Fri, 11 Jul 2014 10:32:57 +0000 (11:32 +0100)]
Fix subtitle panel enabling.

9 years agoPaint views grey when they are not being used.
Carl Hetherington [Fri, 11 Jul 2014 10:29:32 +0000 (11:29 +0100)]
Paint views grey when they are not being used.

9 years agoRename subtitle_use -> use_subtitles.
Carl Hetherington [Fri, 11 Jul 2014 10:16:01 +0000 (11:16 +0100)]
Rename subtitle_use -> use_subtitles.

9 years agoAdd has_subtitles method to SubtitleContent; tidy up timeline display a bit.
Carl Hetherington [Thu, 10 Jul 2014 21:41:48 +0000 (22:41 +0100)]
Add has_subtitles method to SubtitleContent; tidy up timeline display a bit.

9 years agoBump version
Carl Hetherington [Thu, 10 Jul 2014 20:27:55 +0000 (21:27 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Thu, 10 Jul 2014 20:27:55 +0000 (21:27 +0100)]
Bump version

9 years agoMerge master.
Carl Hetherington [Thu, 10 Jul 2014 19:38:28 +0000 (20:38 +0100)]
Merge master.

9 years agoUpdate test reference.
Carl Hetherington [Thu, 10 Jul 2014 15:50:42 +0000 (16:50 +0100)]
Update test reference.

9 years agoFix previous.
Carl Hetherington [Thu, 10 Jul 2014 15:37:22 +0000 (16:37 +0100)]
Fix previous.

9 years agoPrevent erroneous creation of subtitle MXF where there are no subtitles.
Carl Hetherington [Thu, 10 Jul 2014 15:28:03 +0000 (16:28 +0100)]
Prevent erroneous creation of subtitle MXF where there are no subtitles.

9 years agoVarious fixes for DCP subtitles, and a test or two.
Carl Hetherington [Thu, 10 Jul 2014 15:15:13 +0000 (16:15 +0100)]
Various fixes for DCP subtitles, and a test or two.

9 years agoMerge.
Carl Hetherington [Thu, 10 Jul 2014 14:58:21 +0000 (15:58 +0100)]
Merge.

9 years agoHopefully fix KDM email corruption.
Carl Hetherington [Thu, 10 Jul 2014 14:57:48 +0000 (15:57 +0100)]
Hopefully fix KDM email corruption.

Reported-by: Carsten Kurz
9 years agoBump version
Carl Hetherington [Thu, 10 Jul 2014 14:37:26 +0000 (15:37 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Thu, 10 Jul 2014 14:37:26 +0000 (15:37 +0100)]
Bump version

9 years agoDocs.
Carl Hetherington [Thu, 10 Jul 2014 10:43:17 +0000 (11:43 +0100)]
Docs.

9 years agoDocs.
Carl Hetherington [Thu, 10 Jul 2014 10:36:19 +0000 (11:36 +0100)]
Docs.

9 years agoDoc update.
Carl Hetherington [Thu, 10 Jul 2014 10:29:26 +0000 (11:29 +0100)]
Doc update.

9 years agoBasics of DCP subtitle import.
Carl Hetherington [Thu, 10 Jul 2014 10:27:26 +0000 (11:27 +0100)]
Basics of DCP subtitle import.

9 years agoDecode DCP audio too.
Carl Hetherington [Thu, 10 Jul 2014 09:01:18 +0000 (10:01 +0100)]
Decode DCP audio too.

9 years agoBasics of direct write of J2K data without encode/decode.
Carl Hetherington [Thu, 10 Jul 2014 08:40:56 +0000 (09:40 +0100)]
Basics of direct write of J2K data without encode/decode.

9 years agoSplit up image_proxy.{cc,h}
Carl Hetherington [Wed, 9 Jul 2014 16:05:26 +0000 (17:05 +0100)]
Split up image_proxy.{cc,h}