dcpomatic.git
9 years agoMerge master.
Carl Hetherington [Mon, 2 Jun 2014 11:06:20 +0000 (12:06 +0100)]
Merge master.

9 years agoBump version
Carl Hetherington [Thu, 29 May 2014 15:38:35 +0000 (16:38 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Thu, 29 May 2014 15:38:35 +0000 (16:38 +0100)]
Bump version

9 years agoTry to fix _iconv symbol not found on OS X for
Carl Hetherington [Thu, 29 May 2014 15:36:11 +0000 (16:36 +0100)]
Try to fix _iconv symbol not found on OS X for
dcpomatic_server_cli.

Reported-by: Carsten Kurz
9 years agoLayout tweaks.
Carl Hetherington [Thu, 29 May 2014 08:21:41 +0000 (09:21 +0100)]
Layout tweaks.

9 years agoBump version
Carl Hetherington [Wed, 28 May 2014 22:36:27 +0000 (23:36 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Wed, 28 May 2014 22:36:27 +0000 (23:36 +0100)]
Bump version

9 years agoMerge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Wed, 28 May 2014 22:34:29 +0000 (23:34 +0100)]
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

9 years agoBump libdcp requirement.
Carl Hetherington [Wed, 28 May 2014 22:34:26 +0000 (23:34 +0100)]
Bump libdcp requirement.

9 years agoBump version
Carl Hetherington [Wed, 28 May 2014 22:32:27 +0000 (23:32 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Wed, 28 May 2014 22:32:27 +0000 (23:32 +0100)]
Bump version

9 years agoModify KDM generation to work with CPLs rather than DCPs, and allow
Carl Hetherington [Wed, 28 May 2014 22:25:11 +0000 (23:25 +0100)]
Modify KDM generation to work with CPLs rather than DCPs, and allow
user to specify a particular CPL to use.  Tidy up the KDM dialog
a bit.

9 years agoBump version
Carl Hetherington [Tue, 27 May 2014 13:40:35 +0000 (14:40 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Tue, 27 May 2014 13:40:35 +0000 (14:40 +0100)]
Bump version

9 years agoMerge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Tue, 27 May 2014 13:40:12 +0000 (14:40 +0100)]
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

9 years agoFix cscript libdcp dep to match wscript.
Carl Hetherington [Tue, 27 May 2014 13:40:08 +0000 (14:40 +0100)]
Fix cscript libdcp dep to match wscript.

9 years agoBump version
Carl Hetherington [Sun, 25 May 2014 23:20:55 +0000 (00:20 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Sun, 25 May 2014 23:20:55 +0000 (00:20 +0100)]
Bump version

9 years agoTester.
Carl Hetherington [Sun, 25 May 2014 23:20:35 +0000 (00:20 +0100)]
Tester.

9 years agoAccount for FFmpeg content start_time being non-zero:
Carl Hetherington [Sun, 25 May 2014 23:18:07 +0000 (00:18 +0100)]
Account for FFmpeg content start_time being non-zero:

Reported-by: Sumit Guha
9 years agoMore logging tweaks; missing noncopyable.
Carl Hetherington [Sun, 25 May 2014 22:23:48 +0000 (23:23 +0100)]
More logging tweaks; missing noncopyable.

9 years agoLogging tweaks.
Carl Hetherington [Sun, 25 May 2014 22:17:05 +0000 (23:17 +0100)]
Logging tweaks.

9 years agoBump libdcp required version.
Carl Hetherington [Sun, 25 May 2014 20:30:08 +0000 (21:30 +0100)]
Bump libdcp required version.

9 years agoMerge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Sat, 24 May 2014 21:52:05 +0000 (22:52 +0100)]
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

9 years agoAdd tester.
Carl Hetherington [Sat, 24 May 2014 21:51:56 +0000 (22:51 +0100)]
Add tester.

9 years agoBump version
Carl Hetherington [Sat, 24 May 2014 21:47:45 +0000 (22:47 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Sat, 24 May 2014 21:47:45 +0000 (22:47 +0100)]
Bump version

9 years agoRely on Config for log settings, not the command line.
Carl Hetherington [Sat, 24 May 2014 21:47:29 +0000 (22:47 +0100)]
Rely on Config for log settings, not the command line.

9 years agoBump version
Carl Hetherington [Fri, 23 May 2014 21:55:05 +0000 (22:55 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Fri, 23 May 2014 21:55:05 +0000 (22:55 +0100)]
Bump version

9 years agoTweak logging a bit.
Carl Hetherington [Fri, 23 May 2014 21:45:06 +0000 (22:45 +0100)]
Tweak logging a bit.

9 years agoBasics of noting subtitle times in FFmpegSubtitleStreams.
Carl Hetherington [Thu, 22 May 2014 15:53:38 +0000 (16:53 +0100)]
Basics of noting subtitle times in FFmpegSubtitleStreams.

9 years agoSplit FFmpegExaminer stuff into separate methods.
Carl Hetherington [Thu, 22 May 2014 14:20:20 +0000 (15:20 +0100)]
Split FFmpegExaminer stuff into separate methods.

9 years agoCorrectly close all codecs, I think.
Carl Hetherington [Thu, 22 May 2014 14:07:31 +0000 (15:07 +0100)]
Correctly close all codecs, I think.

9 years agoSet up all FFmpeg decoders in one method.
Carl Hetherington [Thu, 22 May 2014 14:05:57 +0000 (15:05 +0100)]
Set up all FFmpeg decoders in one method.

9 years agoAdd ContentTimePeriod class.
Carl Hetherington [Thu, 22 May 2014 13:57:56 +0000 (14:57 +0100)]
Add ContentTimePeriod class.

9 years agoMove FFmpegStream classes into their own source files.
Carl Hetherington [Thu, 22 May 2014 13:34:27 +0000 (14:34 +0100)]
Move FFmpegStream classes into their own source files.

9 years agoBump version
Carl Hetherington [Thu, 22 May 2014 00:02:29 +0000 (01:02 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Thu, 22 May 2014 00:02:29 +0000 (01:02 +0100)]
Bump version

9 years agoMore Windows fixes.
Carl Hetherington [Wed, 21 May 2014 23:31:08 +0000 (00:31 +0100)]
More Windows fixes.

9 years agoSome callers insist on aligned images.
Carl Hetherington [Wed, 21 May 2014 23:30:08 +0000 (00:30 +0100)]
Some callers insist on aligned images.

9 years agoFix small problem with subtitles and start-trim (I think).
Carl Hetherington [Wed, 21 May 2014 23:29:58 +0000 (00:29 +0100)]
Fix small problem with subtitles and start-trim (I think).

9 years agoWindows build fix.
Carl Hetherington [Wed, 21 May 2014 23:17:27 +0000 (00:17 +0100)]
Windows build fix.

9 years agoTry to fix clashes caused by ERROR, WARNING etc. as variables.
Carl Hetherington [Wed, 21 May 2014 21:34:49 +0000 (22:34 +0100)]
Try to fix clashes caused by ERROR, WARNING etc. as variables.

9 years agoBump version
Carl Hetherington [Wed, 21 May 2014 15:44:35 +0000 (16:44 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Wed, 21 May 2014 15:44:35 +0000 (16:44 +0100)]
Bump version

9 years agoTidy up logging a bit. Make it configurable from the GUI.
Carl Hetherington [Wed, 21 May 2014 15:44:06 +0000 (16:44 +0100)]
Tidy up logging a bit.  Make it configurable from the GUI.

9 years agoBump current_state_version to 32 and read video lengths correctly from old files.
Carl Hetherington [Wed, 21 May 2014 15:41:56 +0000 (16:41 +0100)]
Bump current_state_version to 32 and read video lengths correctly from old files.

9 years agoAdd some timing logs to image_proxy.
Carl Hetherington [Wed, 21 May 2014 09:14:41 +0000 (10:14 +0100)]
Add some timing logs to image_proxy.

9 years agoFix static build.
Carl Hetherington [Tue, 20 May 2014 20:41:41 +0000 (21:41 +0100)]
Fix static build.

9 years agoRevert "Fix static build."
Carl Hetherington [Tue, 20 May 2014 20:41:18 +0000 (21:41 +0100)]
Revert "Fix static build."

This reverts commit 3bf376a8e2ca0464f483c8c8b18192874b2f007d.

9 years agoFix static build.
Carl Hetherington [Tue, 20 May 2014 20:40:55 +0000 (21:40 +0100)]
Fix static build.

9 years agoRemove operator<< which is defined in libdcp now.
Carl Hetherington [Tue, 20 May 2014 19:40:48 +0000 (20:40 +0100)]
Remove operator<< which is defined in libdcp now.

9 years agoFix non-debug build.
Carl Hetherington [Tue, 20 May 2014 19:35:39 +0000 (20:35 +0100)]
Fix non-debug build.

9 years agolibdcp -> dcp fixes.
Carl Hetherington [Tue, 20 May 2014 19:22:17 +0000 (20:22 +0100)]
libdcp -> dcp fixes.

9 years agoMerge master.
Carl Hetherington [Tue, 20 May 2014 12:23:26 +0000 (13:23 +0100)]
Merge master.

9 years agoUse cxml::ConstNodePtr.
Carl Hetherington [Mon, 19 May 2014 10:34:01 +0000 (11:34 +0100)]
Use cxml::ConstNodePtr.

9 years agoBump version
Carl Hetherington [Mon, 19 May 2014 10:16:15 +0000 (11:16 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Mon, 19 May 2014 10:16:15 +0000 (11:16 +0100)]
Bump version

9 years agoChangeLog.
Carl Hetherington [Mon, 19 May 2014 10:15:25 +0000 (11:15 +0100)]
ChangeLog.

9 years agoMerge delay-decode-take2 branch into master.
Carl Hetherington [Mon, 19 May 2014 10:05:10 +0000 (11:05 +0100)]
Merge delay-decode-take2 branch into master.

9 years agoMerge master.
Carl Hetherington [Fri, 16 May 2014 11:32:04 +0000 (12:32 +0100)]
Merge master.

9 years agoBump version
Carl Hetherington [Fri, 16 May 2014 10:45:04 +0000 (11:45 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Fri, 16 May 2014 10:45:04 +0000 (11:45 +0100)]
Bump version

9 years agoMerge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Fri, 16 May 2014 10:42:24 +0000 (11:42 +0100)]
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

9 years agoFix various confusions in translations of abbreviated channel names
Carl Hetherington [Fri, 16 May 2014 10:41:55 +0000 (11:41 +0100)]
Fix various confusions in translations of abbreviated channel names
(Lc, Rc etc.)

Reported-by: Carsten Kurz
9 years agoBump libdcp dep for timezone fixes.
Carl Hetherington [Thu, 15 May 2014 23:02:05 +0000 (18:02 -0500)]
Bump libdcp dep for timezone fixes.

9 years agoAdd some comments.
Carl Hetherington [Thu, 15 May 2014 22:57:31 +0000 (17:57 -0500)]
Add some comments.

9 years agoBump version
Carl Hetherington [Wed, 14 May 2014 21:53:59 +0000 (22:53 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Wed, 14 May 2014 21:53:59 +0000 (22:53 +0100)]
Bump version

9 years agoBump libdcp to remove checks on PCM MXF edit rates,
Carl Hetherington [Wed, 14 May 2014 21:41:12 +0000 (22:41 +0100)]
Bump libdcp to remove checks on PCM MXF edit rates,
so we can generate strange ones in DCP-o-matic.

Reported-by: Noah Orozco
9 years agoMerge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Wed, 14 May 2014 21:35:19 +0000 (22:35 +0100)]
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

9 years agoFix assertion failure on cancelling a File->Exit.
Carl Hetherington [Wed, 14 May 2014 21:35:08 +0000 (22:35 +0100)]
Fix assertion failure on cancelling a File->Exit.

9 years agoBump libdcp dep.
Carl Hetherington [Wed, 14 May 2014 20:09:44 +0000 (21:09 +0100)]
Bump libdcp dep.

9 years agoAdd ImageProxy class.
Carl Hetherington [Wed, 14 May 2014 20:06:23 +0000 (21:06 +0100)]
Add ImageProxy class.

9 years agoMake DCPVideoFrame use PlayerVideoFrame to store its image.
Carl Hetherington [Wed, 14 May 2014 18:27:04 +0000 (19:27 +0100)]
Make DCPVideoFrame use PlayerVideoFrame to store its image.

9 years agoMove Eyes and ColourConversion into PlayerVideoFrame.
Carl Hetherington [Wed, 14 May 2014 10:27:17 +0000 (11:27 +0100)]
Move Eyes and ColourConversion into PlayerVideoFrame.

9 years agoRename PlayerImage to PlayerVideoFrame and give it its own file.
Carl Hetherington [Wed, 14 May 2014 09:05:56 +0000 (10:05 +0100)]
Rename PlayerImage to PlayerVideoFrame and give it its own file.

9 years agoBump version
Carl Hetherington [Tue, 13 May 2014 22:08:42 +0000 (23:08 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Tue, 13 May 2014 22:08:42 +0000 (23:08 +0100)]
Bump version

9 years agoRemove 100fps limit when using "any DCP frame rate".
Carl Hetherington [Tue, 13 May 2014 22:07:37 +0000 (23:07 +0100)]
Remove 100fps limit when using "any DCP frame rate".

Reported-by: Noah Orozco
9 years agoBump version
Carl Hetherington [Mon, 12 May 2014 22:30:33 +0000 (23:30 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Mon, 12 May 2014 22:30:33 +0000 (23:30 +0100)]
Bump version

9 years agoAdd option to use any DCP frame rate, rather than just the
Carl Hetherington [Mon, 12 May 2014 22:29:21 +0000 (23:29 +0100)]
Add option to use any DCP frame rate, rather than just the
"allowed" set.

Requested-by: Noah Orozco
9 years agoBump version
Carl Hetherington [Mon, 12 May 2014 09:07:31 +0000 (10:07 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Mon, 12 May 2014 09:07:31 +0000 (10:07 +0100)]
Bump version

9 years agoMerge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Mon, 12 May 2014 09:07:05 +0000 (10:07 +0100)]
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

9 years agoFix crash caused by previous change; doubles are expressed using scientific notation...
Carl Hetherington [Mon, 12 May 2014 09:06:57 +0000 (10:06 +0100)]
Fix crash caused by previous change; doubles are expressed using scientific notation by default, so avoid them where possible.

9 years agoBump version
Carl Hetherington [Mon, 12 May 2014 00:01:53 +0000 (01:01 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Mon, 12 May 2014 00:01:53 +0000 (01:01 +0100)]
Bump version

9 years agoBump libdcp in cscript.
Carl Hetherington [Mon, 12 May 2014 00:01:20 +0000 (01:01 +0100)]
Bump libdcp in cscript.

9 years agoMerge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Mon, 12 May 2014 00:00:33 +0000 (01:00 +0100)]
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

9 years agoChangeLog.
Carl Hetherington [Mon, 12 May 2014 00:00:26 +0000 (01:00 +0100)]
ChangeLog.

9 years agoRemove LocaleGuard and lexical_cast<> in favour of libdcp::raw_convert,
Carl Hetherington [Sun, 11 May 2014 23:57:51 +0000 (00:57 +0100)]
Remove LocaleGuard and lexical_cast<> in favour of libdcp::raw_convert,
which should get things right with both decimal and thousands
separators; LocaleGuard fixed decimal separators ok but not, it appears,
thousands ones.

9 years agoMerge master.
Carl Hetherington [Sat, 10 May 2014 13:13:10 +0000 (14:13 +0100)]
Merge master.

9 years agoBump version
Carl Hetherington [Sat, 10 May 2014 12:40:33 +0000 (13:40 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Sat, 10 May 2014 12:40:33 +0000 (13:40 +0100)]
Bump version

9 years agoMerge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Sat, 10 May 2014 12:36:19 +0000 (13:36 +0100)]
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

9 years agoFix setup of the libswresample context to work with high channel
Carl Hetherington [Sat, 10 May 2014 12:35:55 +0000 (13:35 +0100)]
Fix setup of the libswresample context to work with high channel
counts.

Reported-by: Sumit
9 years agoBump version
Carl Hetherington [Fri, 9 May 2014 21:57:47 +0000 (22:57 +0100)]
Bump version