dcpomatic.git
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

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

9 years agoMerge.
Carl Hetherington [Fri, 9 May 2014 21:57:30 +0000 (22:57 +0100)]
Merge.

9 years agoFix crash on using content with more than 12 audio channels.
Carl Hetherington [Fri, 9 May 2014 21:55:43 +0000 (22:55 +0100)]
Fix crash on using content with more than 12 audio channels.

Reported-by: Sumit
9 years agoMAX_AUDIO_CHANNELS -> MAX_DCP_AUDIO_CHANNELS.
Carl Hetherington [Fri, 9 May 2014 21:51:30 +0000 (22:51 +0100)]
MAX_AUDIO_CHANNELS -> MAX_DCP_AUDIO_CHANNELS.

9 years agoChangeLog.
Carl Hetherington [Fri, 9 May 2014 21:31:05 +0000 (22:31 +0100)]
ChangeLog.

9 years agoRe-introduce ffprobe call when adding content.
Carl Hetherington [Fri, 9 May 2014 21:30:49 +0000 (22:30 +0100)]
Re-introduce ffprobe call when adding content.

9 years agoMerge master.
Carl Hetherington [Tue, 6 May 2014 23:11:04 +0000 (00:11 +0100)]
Merge master.

9 years agoBump version
Carl Hetherington [Mon, 5 May 2014 15:41:46 +0000 (16:41 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Mon, 5 May 2014 15:41:46 +0000 (16:41 +0100)]
Bump version

9 years agoMerge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
Carl Hetherington [Mon, 5 May 2014 11:13:49 +0000 (12:13 +0100)]
Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic

9 years agoUpdate OS X environment location.
Carl Hetherington [Mon, 5 May 2014 11:13:17 +0000 (12:13 +0100)]
Update OS X environment location.

9 years agoBump version
Carl Hetherington [Fri, 2 May 2014 21:01:44 +0000 (22:01 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Fri, 2 May 2014 21:01:44 +0000 (22:01 +0100)]
Bump version

9 years agopot merge.
Carl Hetherington [Fri, 2 May 2014 21:01:25 +0000 (22:01 +0100)]
pot merge.

9 years agoComments.
Carl Hetherington [Fri, 2 May 2014 19:13:38 +0000 (20:13 +0100)]
Comments.

9 years agoComments.
Carl Hetherington [Fri, 2 May 2014 19:06:58 +0000 (20:06 +0100)]
Comments.

9 years agoHopefully fix crash at the end of tests.
Carl Hetherington [Fri, 2 May 2014 19:06:55 +0000 (20:06 +0100)]
Hopefully fix crash at the end of tests.

9 years agoRename AudioContent frame_rate methods and move resampled_audio_frame_rate into Audio...
Carl Hetherington [Fri, 2 May 2014 17:17:35 +0000 (18:17 +0100)]
Rename AudioContent frame_rate methods and move resampled_audio_frame_rate into AudioContent.

9 years agoComments.
Carl Hetherington [Fri, 2 May 2014 17:15:36 +0000 (18:15 +0100)]
Comments.

9 years agoRevert "Hack around crash on exist of tests due to race between ~FFmpeg and __cxa_fin...
Carl Hetherington [Fri, 2 May 2014 17:04:01 +0000 (18:04 +0100)]
Revert "Hack around crash on exist of tests due to race between ~FFmpeg and __cxa_finalize."

This reverts commit fde38b664c98205dd4fe3721b125469d5dd2ecbe.

9 years agoHack around crash on exist of tests due to race between ~FFmpeg and __cxa_finalize.
Carl Hetherington [Fri, 2 May 2014 16:45:42 +0000 (17:45 +0100)]
Hack around crash on exist of tests due to race between ~FFmpeg and __cxa_finalize.

9 years agoUpdate Doxyfile for newer doxygen.
Carl Hetherington [Fri, 2 May 2014 14:28:13 +0000 (15:28 +0100)]
Update Doxyfile for newer doxygen.

9 years agoComments.
Carl Hetherington [Fri, 2 May 2014 12:54:48 +0000 (13:54 +0100)]
Comments.

9 years agoFix crash.
Carl Hetherington [Fri, 2 May 2014 12:51:07 +0000 (13:51 +0100)]
Fix crash.

9 years agoFix a spurious assert() failure.
Carl Hetherington [Fri, 2 May 2014 12:51:03 +0000 (13:51 +0100)]
Fix a spurious assert() failure.

9 years agoAdd missing seek stuff to SubtitleDecoder.
Carl Hetherington [Fri, 2 May 2014 09:42:06 +0000 (10:42 +0100)]
Add missing seek stuff to SubtitleDecoder.

9 years agoThese tests need a valid Film.
Carl Hetherington [Fri, 2 May 2014 09:41:50 +0000 (10:41 +0100)]
These tests need a valid Film.

9 years agoCast to double when converting time, same as in the tests.
Carl Hetherington [Fri, 2 May 2014 09:41:27 +0000 (10:41 +0100)]
Cast to double when converting time, same as in the tests.

9 years agoFix subrip test.
Carl Hetherington [Fri, 2 May 2014 08:03:08 +0000 (09:03 +0100)]
Fix subrip test.

9 years agoFix skip_frame_test.
Carl Hetherington [Thu, 1 May 2014 15:32:21 +0000 (16:32 +0100)]
Fix skip_frame_test.

9 years agoComments.
Carl Hetherington [Thu, 1 May 2014 14:07:04 +0000 (15:07 +0100)]
Comments.

9 years agoFix 3D support.
Carl Hetherington [Thu, 1 May 2014 13:32:45 +0000 (14:32 +0100)]
Fix 3D support.

9 years agoFix assert failure.
Carl Hetherington [Thu, 1 May 2014 11:34:18 +0000 (12:34 +0100)]
Fix assert failure.

9 years agoAdd FIXME.
Carl Hetherington [Thu, 1 May 2014 11:34:09 +0000 (12:34 +0100)]
Add FIXME.

9 years agoFix test comparison of float.
Carl Hetherington [Thu, 1 May 2014 11:34:02 +0000 (12:34 +0100)]
Fix test comparison of float.

9 years agoVarious fixes so that audio_delay_test works again.
Carl Hetherington [Wed, 30 Apr 2014 23:25:30 +0000 (00:25 +0100)]
Various fixes so that audio_delay_test works again.

9 years agoAdd AudioBuffers unit test.
Carl Hetherington [Tue, 29 Apr 2014 21:57:31 +0000 (22:57 +0100)]
Add AudioBuffers unit test.

9 years agoHeader tweak.
Carl Hetherington [Tue, 29 Apr 2014 21:57:12 +0000 (22:57 +0100)]
Header tweak.

9 years agoVarious comment fixes to tests.
Carl Hetherington [Tue, 29 Apr 2014 19:57:02 +0000 (20:57 +0100)]
Various comment fixes to tests.

9 years agoMerge master.
Carl Hetherington [Tue, 29 Apr 2014 18:34:13 +0000 (19:34 +0100)]
Merge master.

9 years agoBump version
Carl Hetherington [Tue, 29 Apr 2014 17:29:54 +0000 (18:29 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Tue, 29 Apr 2014 17:29:54 +0000 (18:29 +0100)]
Bump version

9 years agoBump max libopenjpeg version to 1.5.2 for Arch Linux, since I'm pretty sure there...
Carl Hetherington [Tue, 29 Apr 2014 17:29:28 +0000 (18:29 +0100)]
Bump max libopenjpeg version to 1.5.2 for Arch Linux, since I'm pretty sure there will be no problems.

9 years agoPython 3 compatibility.
Carl Hetherington [Tue, 29 Apr 2014 17:29:13 +0000 (18:29 +0100)]
Python 3 compatibility.

10 years agoSupporter.
Carl Hetherington [Tue, 29 Apr 2014 13:14:07 +0000 (14:14 +0100)]
Supporter.

10 years agoPossible missing iconv dep in the .dmg.
Carl Hetherington [Tue, 29 Apr 2014 11:11:07 +0000 (12:11 +0100)]
Possible missing iconv dep in the .dmg.

10 years agoMerge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
Carl Hetherington [Tue, 29 Apr 2014 11:10:18 +0000 (12:10 +0100)]
Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic

10 years agoBump ffmpeg for OS X build fix (not linking against JACK).
Carl Hetherington [Tue, 29 Apr 2014 11:10:13 +0000 (12:10 +0100)]
Bump ffmpeg for OS X build fix (not linking against JACK).

10 years agopot_merge.
Carl Hetherington [Tue, 29 Apr 2014 08:14:23 +0000 (09:14 +0100)]
pot_merge.

10 years agoBump version
Carl Hetherington [Tue, 29 Apr 2014 08:12:46 +0000 (09:12 +0100)]
Bump version

10 years agoBump version
Carl Hetherington [Tue, 29 Apr 2014 08:12:46 +0000 (09:12 +0100)]
Bump version

10 years agoComment fixes.
Carl Hetherington [Mon, 28 Apr 2014 23:31:35 +0000 (00:31 +0100)]
Comment fixes.

10 years agoComment fixes.
Carl Hetherington [Mon, 28 Apr 2014 23:30:14 +0000 (00:30 +0100)]
Comment fixes.

10 years agoSome doc fixes.
Carl Hetherington [Mon, 28 Apr 2014 23:28:51 +0000 (00:28 +0100)]
Some doc fixes.

10 years agoMerge master.
Carl Hetherington [Sun, 27 Apr 2014 22:41:26 +0000 (23:41 +0100)]
Merge master.