Carl Hetherington [Sun, 21 Apr 2013 21:41:52 +0000 (22:41 +0100)]
Untested merge of master.
Carl Hetherington [Sun, 21 Apr 2013 16:49:54 +0000 (17:49 +0100)]
Bump version
Carl Hetherington [Sun, 21 Apr 2013 16:49:54 +0000 (17:49 +0100)]
Bump version
Carl Hetherington [Sun, 21 Apr 2013 15:38:22 +0000 (16:38 +0100)]
Revert windows installer ffmpeg DLL versions.
Carl Hetherington [Sun, 21 Apr 2013 13:34:06 +0000 (14:34 +0100)]
Remove old merge tag.
Carl Hetherington [Sun, 21 Apr 2013 12:42:21 +0000 (13:42 +0100)]
Merge master.
Carl Hetherington [Sat, 20 Apr 2013 23:06:12 +0000 (00:06 +0100)]
Bump version
Carl Hetherington [Sat, 20 Apr 2013 19:45:32 +0000 (20:45 +0100)]
Import Ardour's LocaleGuard to fix problems with saving decimals to metadata (#119).
Carl Hetherington [Sat, 20 Apr 2013 01:50:09 +0000 (02:50 +0100)]
Be more careful about the validity of s->metadata.
Carl Hetherington [Sat, 20 Apr 2013 01:27:59 +0000 (02:27 +0100)]
ChangeLog.
Carl Hetherington [Sat, 20 Apr 2013 01:27:27 +0000 (02:27 +0100)]
Merge branch 'staging' of ssh://houllier/home/carl/git/dvdomatic into staging
Carl Hetherington [Sat, 20 Apr 2013 01:26:23 +0000 (02:26 +0100)]
Somewhat hacky but seemingly functional frame back/forward (rest of #68).
Carl Hetherington [Sat, 20 Apr 2013 01:18:23 +0000 (02:18 +0100)]
Fix for 2.8.
Carl Hetherington [Sat, 20 Apr 2013 00:23:58 +0000 (01:23 +0100)]
Go back to last long-running FFmpeg version.
Carl Hetherington [Fri, 19 Apr 2013 21:10:10 +0000 (22:10 +0100)]
Basic frame index and timecode (part of #68).
Carl Hetherington [Fri, 19 Apr 2013 20:20:00 +0000 (21:20 +0100)]
Write metadata on new film to go with the directory that is created.
Carl Hetherington [Fri, 19 Apr 2013 16:41:58 +0000 (17:41 +0100)]
Bump version
Carl Hetherington [Fri, 19 Apr 2013 16:41:25 +0000 (17:41 +0100)]
Bump ffmpeg versions in windows installer.
Carl Hetherington [Fri, 19 Apr 2013 10:36:37 +0000 (11:36 +0100)]
Bump version
Carl Hetherington [Fri, 19 Apr 2013 10:15:57 +0000 (11:15 +0100)]
Merge branch 'staging' of /home/carl/git/dvdomatic into staging
Carl Hetherington [Fri, 19 Apr 2013 10:12:09 +0000 (11:12 +0100)]
Bump version
Carl Hetherington [Fri, 19 Apr 2013 10:11:44 +0000 (11:11 +0100)]
Fix ffmpeg revision.
Carl Hetherington [Fri, 19 Apr 2013 10:11:26 +0000 (11:11 +0100)]
Merge branch 'staging' of /home/carl/git/dvdomatic into staging
Carl Hetherington [Fri, 19 Apr 2013 10:11:11 +0000 (11:11 +0100)]
Fix ffmpeg revision.
Carl Hetherington [Thu, 18 Apr 2013 23:28:10 +0000 (00:28 +0100)]
Fix warning.
Carl Hetherington [Thu, 18 Apr 2013 22:32:17 +0000 (23:32 +0100)]
Bump version
Carl Hetherington [Thu, 18 Apr 2013 22:29:45 +0000 (23:29 +0100)]
Merge branch 'master' into staging
Carl Hetherington [Thu, 18 Apr 2013 22:28:47 +0000 (23:28 +0100)]
Typo.
Carl Hetherington [Thu, 18 Apr 2013 22:27:51 +0000 (23:27 +0100)]
Typo.
Carl Hetherington [Thu, 18 Apr 2013 22:26:10 +0000 (23:26 +0100)]
Specify dep versions.
Carl Hetherington [Thu, 18 Apr 2013 22:24:18 +0000 (23:24 +0100)]
Bump libdcp version.
Carl Hetherington [Thu, 18 Apr 2013 22:23:37 +0000 (23:23 +0100)]
Merge branch 'master' into staging
Carl Hetherington [Thu, 18 Apr 2013 22:17:10 +0000 (23:17 +0100)]
Various cdist fixes.
Carl Hetherington [Wed, 17 Apr 2013 10:09:54 +0000 (11:09 +0100)]
Another typo.
Carl Hetherington [Wed, 17 Apr 2013 10:09:20 +0000 (11:09 +0100)]
Typo.
Carl Hetherington [Wed, 17 Apr 2013 10:08:43 +0000 (11:08 +0100)]
Fix typo.
Carl Hetherington [Wed, 17 Apr 2013 10:08:17 +0000 (11:08 +0100)]
Add dependencies() and build() to script.
Carl Hetherington [Wed, 17 Apr 2013 09:42:03 +0000 (10:42 +0100)]
Merge branch 'master' into content-rework-take5
Carl Hetherington [Wed, 17 Apr 2013 09:41:57 +0000 (10:41 +0100)]
Merge branch 'master' into staging
Carl Hetherington [Wed, 17 Apr 2013 09:41:50 +0000 (10:41 +0100)]
More cscript tweaks.
Carl Hetherington [Wed, 17 Apr 2013 09:41:25 +0000 (10:41 +0100)]
More cscript tweaks.
Carl Hetherington [Wed, 17 Apr 2013 09:38:06 +0000 (10:38 +0100)]
Merge branch 'master' into content-rework-take5
Carl Hetherington [Wed, 17 Apr 2013 09:37:12 +0000 (10:37 +0100)]
Merge branch 'master' into staging
Carl Hetherington [Wed, 17 Apr 2013 09:37:04 +0000 (10:37 +0100)]
cscript; rename build -> release.
Carl Hetherington [Tue, 16 Apr 2013 11:28:15 +0000 (12:28 +0100)]
Fix setup of resampler channel counts.
Carl Hetherington [Tue, 16 Apr 2013 10:43:29 +0000 (11:43 +0100)]
Merge master.
Carl Hetherington [Tue, 16 Apr 2013 09:07:27 +0000 (10:07 +0100)]
Merge branch 'master' into trimming
Carl Hetherington [Mon, 15 Apr 2013 21:07:47 +0000 (22:07 +0100)]
Remove old file.
Carl Hetherington [Mon, 15 Apr 2013 21:05:51 +0000 (22:05 +0100)]
ChangeLog.
Carl Hetherington [Mon, 15 Apr 2013 21:00:15 +0000 (22:00 +0100)]
Merge branch 'fix-early-audio-take2' into staging
Carl Hetherington [Mon, 15 Apr 2013 21:00:04 +0000 (22:00 +0100)]
Merge branch 'master' into fix-early-audio-take2
Carl Hetherington [Mon, 15 Apr 2013 20:57:23 +0000 (21:57 +0100)]
Merge branch 'master' into format-fix
Carl Hetherington [Mon, 15 Apr 2013 20:51:30 +0000 (21:51 +0100)]
ChangeLog.
Carl Hetherington [Mon, 15 Apr 2013 20:36:51 +0000 (21:36 +0100)]
Merge branch 'debug-i18n' of ssh://houllier/home/carl/git/dvdomatic into debug-i18n
Carl Hetherington [Mon, 15 Apr 2013 20:36:27 +0000 (21:36 +0100)]
Merge branch 'master' into debug-i18n
Carl Hetherington [Mon, 15 Apr 2013 20:36:23 +0000 (21:36 +0100)]
Set language for English rather than just using blank string.
Carl Hetherington [Mon, 15 Apr 2013 17:46:34 +0000 (18:46 +0100)]
Merge branch 'master' into debug-i18n
Carl Hetherington [Mon, 15 Apr 2013 15:24:03 +0000 (16:24 +0100)]
Repair very bad merge. Mysterious.
Carl Hetherington [Mon, 15 Apr 2013 14:00:35 +0000 (15:00 +0100)]
Merge master.
Carl Hetherington [Mon, 15 Apr 2013 11:53:05 +0000 (12:53 +0100)]
Merge branch 'master' of /home/carl/git/dvdomatic
Carl Hetherington [Mon, 15 Apr 2013 07:25:59 +0000 (08:25 +0100)]
Fix typo.
Carl Hetherington [Sun, 14 Apr 2013 23:20:56 +0000 (00:20 +0100)]
Try to fix problems with empty configured language.
Carl Hetherington [Sun, 14 Apr 2013 22:41:57 +0000 (23:41 +0100)]
Add Trimmer class; not linked in.
Carl Hetherington [Sun, 14 Apr 2013 22:40:37 +0000 (23:40 +0100)]
merge.
Carl Hetherington [Sun, 14 Apr 2013 22:40:15 +0000 (23:40 +0100)]
Try to fix path.
Carl Hetherington [Sun, 14 Apr 2013 14:57:10 +0000 (15:57 +0100)]
Fix path.
Carl Hetherington [Sun, 14 Apr 2013 13:24:07 +0000 (14:24 +0100)]
Fix Playlist::has_audio().
Carl Hetherington [Sun, 14 Apr 2013 13:09:29 +0000 (14:09 +0100)]
Merge branch 'content-rework-take5' of ssh://houllier/home/carl/git/dvdomatic into content-rework-take5
Carl Hetherington [Sun, 14 Apr 2013 13:08:57 +0000 (14:08 +0100)]
Re-add some missing files.
Carl Hetherington [Sun, 14 Apr 2013 00:36:51 +0000 (01:36 +0100)]
NS fix.
Carl Hetherington [Sun, 14 Apr 2013 00:17:14 +0000 (01:17 +0100)]
UI and basic back-end state for trim type.
Carl Hetherington [Sat, 13 Apr 2013 23:48:34 +0000 (00:48 +0100)]
Merge branch 'content-rework-take5' of /home/carl/git/dvdomatic into content-rework-take5
Carl Hetherington [Sat, 13 Apr 2013 23:48:27 +0000 (00:48 +0100)]
Fix mapping of audio in DCP.
Carl Hetherington [Sat, 13 Apr 2013 20:27:00 +0000 (21:27 +0100)]
Missing using.
Carl Hetherington [Sat, 13 Apr 2013 20:24:45 +0000 (21:24 +0100)]
ChangeLog.
Carl Hetherington [Sat, 13 Apr 2013 20:24:18 +0000 (21:24 +0100)]
Use film-name-derived names for MXFs in DCPs.
Carl Hetherington [Sat, 13 Apr 2013 20:00:22 +0000 (21:00 +0100)]
Some logging.
Carl Hetherington [Sat, 13 Apr 2013 11:53:40 +0000 (12:53 +0100)]
DVD-o-matic -> DCP-o-matic.
Carl Hetherington [Fri, 12 Apr 2013 19:34:09 +0000 (20:34 +0100)]
Merge branch 'content-rework-take5' of /home/carl/git/dvdomatic into content-rework-take5
Carl Hetherington [Fri, 12 Apr 2013 19:29:27 +0000 (20:29 +0100)]
Catch exceptions when checking disk space.
Carl Hetherington [Fri, 12 Apr 2013 19:29:17 +0000 (20:29 +0100)]
Seems wrong to try to complete an encode if it has thrown an exception.
Carl Hetherington [Fri, 12 Apr 2013 19:10:34 +0000 (20:10 +0100)]
Fix crash on encoding with no subs.
Carl Hetherington [Fri, 12 Apr 2013 19:02:31 +0000 (20:02 +0100)]
Note.
Carl Hetherington [Thu, 11 Apr 2013 23:21:30 +0000 (00:21 +0100)]
Fix typo.
Carl Hetherington [Thu, 11 Apr 2013 23:19:53 +0000 (00:19 +0100)]
Restore digests for content.
Carl Hetherington [Thu, 11 Apr 2013 20:01:46 +0000 (21:01 +0100)]
Fix audio display to only offer available channels.
Carl Hetherington [Thu, 11 Apr 2013 13:24:52 +0000 (14:24 +0100)]
Try to fix lack of subs in the viewer after they are turned on.
Carl Hetherington [Thu, 11 Apr 2013 13:17:54 +0000 (14:17 +0100)]
Make note.
Carl Hetherington [Thu, 11 Apr 2013 13:17:42 +0000 (14:17 +0100)]
Make note.
Carl Hetherington [Thu, 11 Apr 2013 13:13:27 +0000 (14:13 +0100)]
Add cxml to windows installer.
Carl Hetherington [Thu, 11 Apr 2013 12:14:51 +0000 (13:14 +0100)]
More static fixes.
Carl Hetherington [Thu, 11 Apr 2013 11:39:51 +0000 (12:39 +0100)]
More trying to fix static build.
Carl Hetherington [Thu, 11 Apr 2013 11:16:27 +0000 (12:16 +0100)]
Static / wx2.8 fixes.
Carl Hetherington [Wed, 10 Apr 2013 22:48:26 +0000 (23:48 +0100)]
Note.
Carl Hetherington [Wed, 10 Apr 2013 22:46:31 +0000 (23:46 +0100)]
Fix thinko.
Carl Hetherington [Wed, 10 Apr 2013 19:45:07 +0000 (20:45 +0100)]
Remove believed unnecessary audio channel layout stuff for resampler.
Carl Hetherington [Wed, 10 Apr 2013 19:17:52 +0000 (20:17 +0100)]
Fix typo.
Carl Hetherington [Wed, 10 Apr 2013 18:52:20 +0000 (19:52 +0100)]
Fix the merge.
Carl Hetherington [Wed, 10 Apr 2013 18:43:01 +0000 (19:43 +0100)]
Merge master.
Carl Hetherington [Wed, 10 Apr 2013 18:40:45 +0000 (19:40 +0100)]
Various fix-ups.