dcpomatic.git
9 years agoMerge master.
Carl Hetherington [Wed, 22 Oct 2014 09:10:54 +0000 (10:10 +0100)]
Merge master.

9 years agoBump version
Carl Hetherington [Wed, 22 Oct 2014 08:32:14 +0000 (09:32 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Wed, 22 Oct 2014 08:32:14 +0000 (09:32 +0100)]
Bump version

9 years agoSupporter.
Carl Hetherington [Wed, 22 Oct 2014 08:30:39 +0000 (09:30 +0100)]
Supporter.

9 years agoIgnore video streams with zero avg_frame_rate in their AVStream (e.g. from iTunes).
Carl Hetherington [Wed, 22 Oct 2014 08:29:38 +0000 (09:29 +0100)]
Ignore video streams with zero avg_frame_rate in their AVStream (e.g. from iTunes).

9 years agoNicer exception when we fail to listen for remote encode servers because some other...
Carl Hetherington [Tue, 21 Oct 2014 19:00:56 +0000 (20:00 +0100)]
Nicer exception when we fail to listen for remote encode servers because some other DCP-o-matic is already at it (backport from 2.0).

9 years agoFix thinko in ExceptionStore; nothing happens after rethrow_exception..! (backport...
Carl Hetherington [Tue, 21 Oct 2014 19:00:29 +0000 (20:00 +0100)]
Fix thinko in ExceptionStore; nothing happens after rethrow_exception..! (backport from 2.0).

9 years agoNicer exception when we fail to listen for remote encode servers because some other...
Carl Hetherington [Tue, 21 Oct 2014 18:59:16 +0000 (19:59 +0100)]
Nicer exception when we fail to listen for remote encode servers because some other DCP-o-matic is already at it.

9 years agoFix thinko in ExceptionStore; nothing happens after rethrow_exception..!
Carl Hetherington [Tue, 21 Oct 2014 18:58:55 +0000 (19:58 +0100)]
Fix thinko in ExceptionStore; nothing happens after rethrow_exception..!

9 years agoMerge master.
Carl Hetherington [Tue, 21 Oct 2014 18:14:58 +0000 (19:14 +0100)]
Merge master.

9 years agoBump version
Carl Hetherington [Mon, 20 Oct 2014 21:50:32 +0000 (22:50 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Mon, 20 Oct 2014 21:50:32 +0000 (22:50 +0100)]
Bump version

9 years agoData must be passed to libdcp xyz conversion as little-endian.
Carl Hetherington [Mon, 20 Oct 2014 21:39:16 +0000 (22:39 +0100)]
Data must be passed to libdcp xyz conversion as little-endian.

9 years agoGive an error in dcpomatic_cli if a content file is not found.
Carl Hetherington [Sun, 19 Oct 2014 21:02:11 +0000 (22:02 +0100)]
Give an error in dcpomatic_cli if a content file is not found.

9 years agoAdd simple note about resampling to the audio panel.
Carl Hetherington [Sun, 19 Oct 2014 16:35:24 +0000 (17:35 +0100)]
Add simple note about resampling to the audio panel.

9 years agoMunge version.
Carl Hetherington [Sun, 19 Oct 2014 14:31:52 +0000 (15:31 +0100)]
Munge version.

9 years agoMore attempts to fix previous.
Carl Hetherington [Sat, 18 Oct 2014 22:57:57 +0000 (23:57 +0100)]
More attempts to fix previous.

9 years agoFix previous properly.
Carl Hetherington [Sat, 18 Oct 2014 22:39:19 +0000 (23:39 +0100)]
Fix previous properly.

9 years agoFix previous.
Carl Hetherington [Sat, 18 Oct 2014 22:30:19 +0000 (23:30 +0100)]
Fix previous.

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

9 years agoFix build on Debian unstable which now has GraphicsMagick rather than ImageMagick.
Carl Hetherington [Sat, 18 Oct 2014 21:18:15 +0000 (22:18 +0100)]
Fix build on Debian unstable which now has GraphicsMagick rather than ImageMagick.

9 years agoAnother static fix.
Carl Hetherington [Fri, 17 Oct 2014 14:08:02 +0000 (15:08 +0100)]
Another static fix.

9 years agoTry to fix static build.
Carl Hetherington [Fri, 17 Oct 2014 13:56:15 +0000 (14:56 +0100)]
Try to fix static build.

9 years agoBump version
Carl Hetherington [Thu, 16 Oct 2014 17:57:29 +0000 (18:57 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Thu, 16 Oct 2014 17:57:29 +0000 (18:57 +0100)]
Bump version

9 years agoFix build.
Carl Hetherington [Thu, 16 Oct 2014 17:57:18 +0000 (18:57 +0100)]
Fix build.

9 years agoBump version
Carl Hetherington [Thu, 16 Oct 2014 15:48:12 +0000 (16:48 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Thu, 16 Oct 2014 15:48:12 +0000 (16:48 +0100)]
Bump version

9 years agoMerge branch 'master' of git.carlh.net:git/dcpomatic
Carl Hetherington [Thu, 16 Oct 2014 15:47:05 +0000 (16:47 +0100)]
Merge branch 'master' of git.carlh.net:git/dcpomatic

9 years agoBump libdcp for 12bit merge.
Carl Hetherington [Thu, 16 Oct 2014 15:46:56 +0000 (16:46 +0100)]
Bump libdcp for 12bit merge.

9 years agoMerge branch 'master' into 12bit
Carl Hetherington [Thu, 16 Oct 2014 15:44:47 +0000 (16:44 +0100)]
Merge branch 'master' into 12bit

9 years agoBump version
Carl Hetherington [Thu, 16 Oct 2014 15:40:17 +0000 (16:40 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Thu, 16 Oct 2014 15:40:17 +0000 (16:40 +0100)]
Bump version

9 years agopot merge.
Carl Hetherington [Thu, 16 Oct 2014 15:39:01 +0000 (16:39 +0100)]
pot merge.

9 years agoBump libdcp version.
Carl Hetherington [Thu, 16 Oct 2014 15:38:38 +0000 (16:38 +0100)]
Bump libdcp version.

9 years agoMerge branch 'master' into 12bit
Carl Hetherington [Thu, 16 Oct 2014 15:30:11 +0000 (16:30 +0100)]
Merge branch 'master' into 12bit

9 years agoSupporter.
Carl Hetherington [Thu, 16 Oct 2014 13:42:29 +0000 (14:42 +0100)]
Supporter.

9 years agoDon't build tests on Centos 7 either.
Carl Hetherington [Thu, 16 Oct 2014 10:03:31 +0000 (11:03 +0100)]
Don't build tests on Centos 7 either.

9 years agoFix previous.
Carl Hetherington [Thu, 16 Oct 2014 09:54:16 +0000 (10:54 +0100)]
Fix previous.

9 years agoMerge branch 'master' of git.carlh.net:git/dcpomatic
Carl Hetherington [Thu, 16 Oct 2014 09:39:31 +0000 (10:39 +0100)]
Merge branch 'master' of git.carlh.net:git/dcpomatic

9 years agoAttempt to fix schroot build on Centos 7.
Carl Hetherington [Thu, 16 Oct 2014 09:39:19 +0000 (10:39 +0100)]
Attempt to fix schroot build on Centos 7.

9 years ago.pot merge.
Carl Hetherington [Wed, 15 Oct 2014 08:37:10 +0000 (09:37 +0100)]
.pot merge.

9 years agoMerge master.
Carl Hetherington [Wed, 15 Oct 2014 08:34:46 +0000 (09:34 +0100)]
Merge master.

9 years agoBump version
Carl Hetherington [Tue, 14 Oct 2014 17:38:17 +0000 (18:38 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Tue, 14 Oct 2014 17:38:17 +0000 (18:38 +0100)]
Bump version

9 years agoTry to fix previous.
Carl Hetherington [Tue, 14 Oct 2014 10:11:52 +0000 (11:11 +0100)]
Try to fix previous.

9 years agoMissing mkdir.
Carl Hetherington [Mon, 13 Oct 2014 22:50:58 +0000 (23:50 +0100)]
Missing mkdir.

9 years agoAnother attempt to fix wxWidgets i18n on Debian/Ubuntu.
Carl Hetherington [Mon, 13 Oct 2014 22:27:24 +0000 (23:27 +0100)]
Another attempt to fix wxWidgets i18n on Debian/Ubuntu.

9 years agoTry to fix wxWidgets string i18n on Debian/Ubuntu.
Carl Hetherington [Mon, 13 Oct 2014 12:52:35 +0000 (13:52 +0100)]
Try to fix wxWidgets string i18n on Debian/Ubuntu.

9 years agoMerge master.
Carl Hetherington [Wed, 8 Oct 2014 22:02:35 +0000 (23:02 +0100)]
Merge master.

9 years agoRemove useless code and clarify comment.
Carl Hetherington [Wed, 8 Oct 2014 16:37:05 +0000 (17:37 +0100)]
Remove useless code and clarify comment.

9 years agoAdd server management scripts.
Carl Hetherington [Wed, 8 Oct 2014 15:59:21 +0000 (16:59 +0100)]
Add server management scripts.

9 years agoUse accept() properly when reading replies to server request broadcasts.
Carl Hetherington [Wed, 8 Oct 2014 15:55:52 +0000 (16:55 +0100)]
Use accept() properly when reading replies to server request broadcasts.
Without this, some replies were being lost.

9 years agoWhite space.
Carl Hetherington [Wed, 8 Oct 2014 15:50:26 +0000 (16:50 +0100)]
White space.

9 years agoBump version
Carl Hetherington [Wed, 8 Oct 2014 09:37:21 +0000 (10:37 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Wed, 8 Oct 2014 09:37:21 +0000 (10:37 +0100)]
Bump version

9 years agoMerge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Wed, 8 Oct 2014 09:36:42 +0000 (10:36 +0100)]
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

9 years agoFix windows DLL names for new ffmpeg.
Carl Hetherington [Wed, 8 Oct 2014 09:36:34 +0000 (10:36 +0100)]
Fix windows DLL names for new ffmpeg.

9 years agoBump version
Carl Hetherington [Wed, 8 Oct 2014 09:06:11 +0000 (10:06 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Wed, 8 Oct 2014 09:06:10 +0000 (10:06 +0100)]
Bump version

9 years agoSimplify (maybe) wxPen use to see if it helps with OS X crashes (at src/osx/carbon...
Carl Hetherington [Wed, 8 Oct 2014 08:54:26 +0000 (09:54 +0100)]
Simplify (maybe) wxPen use to see if it helps with OS X crashes (at src/osx/carbon/graphics.cpp:143).

9 years ago-Wno-unused-result.
Carl Hetherington [Wed, 8 Oct 2014 08:53:47 +0000 (09:53 +0100)]
-Wno-unused-result.

9 years agoFix a couple of vaguely possible uninitialised values.
Carl Hetherington [Wed, 8 Oct 2014 08:53:37 +0000 (09:53 +0100)]
Fix a couple of vaguely possible uninitialised values.

9 years agoMerge master.
Carl Hetherington [Wed, 8 Oct 2014 08:23:49 +0000 (09:23 +0100)]
Merge master.

9 years agoBump version
Carl Hetherington [Mon, 6 Oct 2014 19:50:41 +0000 (20:50 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Mon, 6 Oct 2014 19:50:41 +0000 (20:50 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Mon, 6 Oct 2014 14:17:59 +0000 (15:17 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Mon, 6 Oct 2014 14:17:59 +0000 (15:17 +0100)]
Bump version

9 years agoUse libsub for subrip decoding; improve default position of srt subs.
Carl Hetherington [Mon, 6 Oct 2014 12:31:45 +0000 (13:31 +0100)]
Use libsub for subrip decoding; improve default position of srt subs.

9 years agoMerge 2.0.
Carl Hetherington [Sun, 5 Oct 2014 22:54:26 +0000 (23:54 +0100)]
Merge 2.0.

9 years agoMore sensible default size / position for .srt subs.
Carl Hetherington [Sun, 5 Oct 2014 22:53:54 +0000 (23:53 +0100)]
More sensible default size / position for .srt subs.

9 years agoDon't sign .debs.
Carl Hetherington [Sun, 5 Oct 2014 22:51:26 +0000 (23:51 +0100)]
Don't sign .debs.

9 years agoBump ffmpeg version.
Carl Hetherington [Sun, 5 Oct 2014 22:18:39 +0000 (23:18 +0100)]
Bump ffmpeg version.

9 years agoFix run script for CLI version.
Carl Hetherington [Fri, 3 Oct 2014 23:06:26 +0000 (00:06 +0100)]
Fix run script for CLI version.

9 years agoi18n merge and fixes after hot-keys added.
Carl Hetherington [Fri, 3 Oct 2014 21:43:40 +0000 (22:43 +0100)]
i18n merge and fixes after hot-keys added.

9 years agoBump version
Carl Hetherington [Fri, 3 Oct 2014 18:41:53 +0000 (19:41 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Fri, 3 Oct 2014 18:41:53 +0000 (19:41 +0100)]
Bump version

9 years agoAdd another .srt test; remove checking of .srt subtitle indices as the strict sequenc...
Carl Hetherington [Fri, 3 Oct 2014 18:40:11 +0000 (19:40 +0100)]
Add another .srt test; remove checking of .srt subtitle indices as the strict sequence (1, 2, 3...) does not appear to be strictly adhered to.

9 years agoMerge remote-tracking branch 'origin/master' into 2.0
Carl Hetherington [Thu, 2 Oct 2014 23:07:54 +0000 (00:07 +0100)]
Merge remote-tracking branch 'origin/master' into 2.0

9 years agoSupporter.
Carl Hetherington [Thu, 2 Oct 2014 23:06:01 +0000 (00:06 +0100)]
Supporter.

9 years agoApply subtitle scale (ish) to text subs; should help with #413.
Carl Hetherington [Wed, 1 Oct 2014 23:26:35 +0000 (00:26 +0100)]
Apply subtitle scale (ish) to text subs; should help with #413.

9 years agoApply y offset to text subs.
Carl Hetherington [Wed, 1 Oct 2014 23:13:31 +0000 (00:13 +0100)]
Apply y offset to text subs.

9 years agoSubtitle v position is from 0->1, not a %age.
Carl Hetherington [Wed, 1 Oct 2014 23:13:17 +0000 (00:13 +0100)]
Subtitle v position is from 0->1, not a %age.

9 years agoMerge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Carl Hetherington [Wed, 1 Oct 2014 21:52:08 +0000 (22:52 +0100)]
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

9 years agoTry to fix Centos build.
Carl Hetherington [Wed, 1 Oct 2014 21:51:57 +0000 (22:51 +0100)]
Try to fix Centos build.

9 years agoBump version
Carl Hetherington [Wed, 1 Oct 2014 08:54:33 +0000 (09:54 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Wed, 1 Oct 2014 08:54:33 +0000 (09:54 +0100)]
Bump version

9 years agoMore Windows ffmpeg bumps.
Carl Hetherington [Wed, 1 Oct 2014 08:36:39 +0000 (09:36 +0100)]
More Windows ffmpeg bumps.

9 years agoUpdate Windows deps.
Carl Hetherington [Wed, 1 Oct 2014 08:13:25 +0000 (09:13 +0100)]
Update Windows deps.

9 years agoBump version
Carl Hetherington [Tue, 30 Sep 2014 19:45:49 +0000 (20:45 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Tue, 30 Sep 2014 19:45:49 +0000 (20:45 +0100)]
Bump version

9 years agoChangeLog.
Carl Hetherington [Tue, 30 Sep 2014 19:44:00 +0000 (20:44 +0100)]
ChangeLog.

9 years agoMerge remote-tracking branch 'origin/master' into 2.0
Carl Hetherington [Tue, 30 Sep 2014 19:40:31 +0000 (20:40 +0100)]
Merge remote-tracking branch 'origin/master' into 2.0

9 years agoBump ffmpeg.
Carl Hetherington [Tue, 30 Sep 2014 19:37:51 +0000 (20:37 +0100)]
Bump ffmpeg.

9 years agoBasic video fade support.
Carl Hetherington [Tue, 30 Sep 2014 08:33:33 +0000 (09:33 +0100)]
Basic video fade support.

9 years agoSupporter.
Carl Hetherington [Tue, 30 Sep 2014 19:09:26 +0000 (20:09 +0100)]
Supporter.

9 years agoMerge master.
Carl Hetherington [Mon, 29 Sep 2014 12:49:54 +0000 (13:49 +0100)]
Merge master.

9 years agoAnother shortcut.
Carl Hetherington [Sun, 28 Sep 2014 23:03:20 +0000 (00:03 +0100)]
Another shortcut.

9 years agoBump version
Carl Hetherington [Sun, 28 Sep 2014 22:54:07 +0000 (23:54 +0100)]
Bump version

9 years agoBump version
Carl Hetherington [Sun, 28 Sep 2014 22:54:07 +0000 (23:54 +0100)]
Bump version