dcpomatic.git
5 years agoMore renaming.
Carl Hetherington [Thu, 19 Jul 2018 00:09:19 +0000 (01:09 +0100)]
More renaming.

5 years agoMore old stuff.
Carl Hetherington [Thu, 19 Jul 2018 00:04:04 +0000 (01:04 +0100)]
More old stuff.

5 years agoRemove unused file.
Carl Hetherington [Thu, 19 Jul 2018 00:02:41 +0000 (01:02 +0100)]
Remove unused file.

5 years agoMissing file.
Carl Hetherington [Wed, 18 Jul 2018 23:59:52 +0000 (00:59 +0100)]
Missing file.

5 years agoMore renaming.
Carl Hetherington [Wed, 18 Jul 2018 23:42:56 +0000 (00:42 +0100)]
More renaming.

sed -i "s/emit_text/emit_plain/g" src/lib/*.cc src/lib/*.h
sed -i "s/emit_image_start/emit_bitmap_start/g" src/lib/*.cc src/lib/*.h
sed -i "s/emit_text_start/emit_plain_start/g" src/lib/*.cc src/lib/*.h
sed -i "s/render_subtitles/render_text/g" src/lib/*.cc src/lib/*.h src/lib/wscript test/*.cc
sed -i "s/ImageStart/BitmapStart/g" src/lib/*.cc src/lib/*.h
sed -i "s/TextStart/PlainStart/g" src/lib/*.cc src/lib/*.h test/*.cc src/wx/*.cc
sed -i "s/ImageSubtitle/BitmapText/g" src/lib/*.cc src/lib/*.h
sed -i "s/text_subtitle/plain_text/g" src/lib/*.cc src/lib/*.h src/lib/wscript src/wx/*.cc src/wx/*.h test/*.cc
sed -i "s/image_subtitle/bitmap_text/g" src/lib/*.cc src/lib/*.h
mv src/lib/render_subtitles.cc src/lib/render_text.cc
mv src/lib/render_subtitles.h src/lib/render_text.h
mv src/lib/text_subtitle.cc src/lib/plain_text.cc
mv src/lib/text_subtitle.h src/lib/plain_text.h

5 years agoComment tweak.
Carl Hetherington [Wed, 18 Jul 2018 22:41:07 +0000 (23:41 +0100)]
Comment tweak.

5 years agoMore renaming; text -> plain.
Carl Hetherington [Wed, 18 Jul 2018 22:40:25 +0000 (23:40 +0100)]
More renaming; text -> plain.

sed -i "s/TextTextContent/PlainText/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc
sed -i "s/text_text/plain_text/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc src/lib/wscript
mv src/lib/text_text_content.cc src/lib/plain_text_content.cc
mv src/lib/text_text_content.h src/lib/plain_text_content.h
mv src/lib/text_text_decoder.cc src/lib/plain_text_decoder.cc
mv src/lib/text_text_decoder.h src/lib/plain_text_decoder.h

5 years agoMerge master.
Carl Hetherington [Wed, 18 Jul 2018 22:13:48 +0000 (23:13 +0100)]
Merge master.

5 years agoAdd type for text content (CCAP/subtitle).
Carl Hetherington [Thu, 21 Jun 2018 21:33:02 +0000 (22:33 +0100)]
Add type for text content (CCAP/subtitle).

5 years agoMore CCAP notes.
Carl Hetherington [Mon, 11 Jun 2018 23:20:55 +0000 (00:20 +0100)]
More CCAP notes.

5 years agoMore design musings.
Carl Hetherington [Mon, 11 Jun 2018 23:13:27 +0000 (00:13 +0100)]
More design musings.

5 years agoRename Subtitle -> Text
Carl Hetherington [Mon, 11 Jun 2018 22:50:59 +0000 (23:50 +0100)]
Rename Subtitle -> Text

sed -i "s/SubtitleContent/TextContent/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc
sed -i "s/SubtitleDecoder/TextDecoder/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc
sed -i "s/subtitle_content/text_content/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc src/lib/wscript src/wx/wscript
sed -i "s/subtitle_decoder/text_decoder/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc src/lib/wscript
mv src/lib/subtitle_decoder.cc src/lib/text_decoder.cc
mv src/lib/subtitle_decoder.h src/lib/text_decoder.h
mv src/lib/subtitle_content.cc src/lib/text_content.cc
mv src/lib/subtitle_content.h src/lib/text_content.h
mv src/lib/dcp_subtitle_decoder.cc src/lib/dcp_text_decoder.cc
mv src/lib/dcp_subtitle_decoder.h src/lib/dcp_text_decoder.h
mv src/lib/dcp_subtitle_content.cc src/lib/dcp_text_content.cc
mv src/lib/dcp_subtitle_content.h src/lib/dcp_text_content.h
mv src/lib/text_subtitle_content.cc src/lib/text_text_content.cc
mv src/lib/text_subtitle_content.h src/lib/text_text_content.h
mv src/lib/text_subtitle_decoder.cc src/lib/text_text_decoder.cc
mv src/lib/text_subtitle_decoder.h src/lib/text_text_decoder.h
mv src/wx/timeline_subtitle_content_view.cc src/wx/timeline_text_content_view.cc
mv src/wx/timeline_subtitle_content_view.h src/wx/timeline_text_content_view.h

5 years agoCCAP doc tweaks.
Carl Hetherington [Mon, 11 Jun 2018 22:35:22 +0000 (23:35 +0100)]
CCAP doc tweaks.

5 years agoUpdated fr_FR translation from Thierry Journet.
Carl Hetherington [Thu, 19 Jul 2018 18:46:40 +0000 (19:46 +0100)]
Updated fr_FR translation from Thierry Journet.

5 years agoTidying up of scrolling in the matrix view.
Carl Hetherington [Wed, 18 Jul 2018 21:39:04 +0000 (22:39 +0100)]
Tidying up of scrolling in the matrix view.

5 years agoAdd new graphic.
Carl Hetherington [Wed, 18 Jul 2018 19:43:50 +0000 (20:43 +0100)]
Add new graphic.

5 years agoMerge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Wed, 18 Jul 2018 18:59:21 +0000 (19:59 +0100)]
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

5 years agoUpdated de_DE translation from Carsten Kurz.
Carl Hetherington [Wed, 18 Jul 2018 08:52:41 +0000 (09:52 +0100)]
Updated de_DE translation from Carsten Kurz.

5 years agoAdd some asserts.
Carl Hetherington [Wed, 18 Jul 2018 00:32:42 +0000 (01:32 +0100)]
Add some asserts.

5 years agoFix test.
Carl Hetherington [Mon, 16 Jul 2018 23:00:19 +0000 (00:00 +0100)]
Fix test.

5 years agoFix unit tests since sequencing after trim was added.
Carl Hetherington [Mon, 16 Jul 2018 11:28:43 +0000 (12:28 +0100)]
Fix unit tests since sequencing after trim was added.

5 years agoFix previous.
Carl Hetherington [Mon, 16 Jul 2018 00:50:09 +0000 (01:50 +0100)]
Fix previous.

5 years agoTest output name tweaks.
Carl Hetherington [Mon, 16 Jul 2018 00:48:54 +0000 (01:48 +0100)]
Test output name tweaks.

5 years agoRemove some warnings so that F28 doesn't fail to build due to
Carl Hetherington [Sun, 15 Jul 2018 23:59:11 +0000 (00:59 +0100)]
Remove some warnings so that F28 doesn't fail to build due to
weird docker hang on writing to stderr.

5 years agoBump libdcp for test hang fix.
Carl Hetherington [Sat, 14 Jul 2018 23:04:42 +0000 (00:04 +0100)]
Bump libdcp for test hang fix.

5 years agoAssume .jpf is an image (JPEG2000).
Carl Hetherington [Sat, 14 Jul 2018 22:16:11 +0000 (23:16 +0100)]
Assume .jpf is an image (JPEG2000).

5 years agoStop the build if we can't download the supporters' list.
Carl Hetherington [Sat, 14 Jul 2018 21:18:37 +0000 (22:18 +0100)]
Stop the build if we can't download the supporters' list.

5 years agoFix update check (#1338).
Carl Hetherington [Sat, 14 Jul 2018 20:52:32 +0000 (21:52 +0100)]
Fix update check (#1338).

5 years agoTry to fix Centos build.
Carl Hetherington [Mon, 9 Jul 2018 20:28:56 +0000 (21:28 +0100)]
Try to fix Centos build.

5 years agoDon't write multiple <LoadFont> tags to Interop subtitles (#1273).
Carl Hetherington [Mon, 9 Jul 2018 19:10:09 +0000 (20:10 +0100)]
Don't write multiple <LoadFont> tags to Interop subtitles (#1273).

5 years agoChangeLog typo. v2.13.35
Carl Hetherington [Mon, 9 Jul 2018 14:53:59 +0000 (15:53 +0100)]
ChangeLog typo.

5 years agoSequence content after trim changes (#1327). This gives me a slight
Carl Hetherington [Mon, 9 Jul 2018 14:49:32 +0000 (15:49 +0100)]
Sequence content after trim changes (#1327).  This gives me a slight
sense of unease but let's see how it goes.

5 years agoMaintain frame-snap for position and trim when set_video_frame_rate is called (#1335).
Carl Hetherington [Mon, 9 Jul 2018 14:38:44 +0000 (15:38 +0100)]
Maintain frame-snap for position and trim when set_video_frame_rate is called (#1335).

5 years agoTry to fix build on Fedora 28.
Carl Hetherington [Mon, 9 Jul 2018 10:47:38 +0000 (11:47 +0100)]
Try to fix build on Fedora 28.

5 years agoTry to fix OS X build.
Carl Hetherington [Mon, 9 Jul 2018 09:31:27 +0000 (10:31 +0100)]
Try to fix OS X build.

5 years agoBump libsub for build fix.
Carl Hetherington [Mon, 9 Jul 2018 09:05:50 +0000 (10:05 +0100)]
Bump libsub for build fix.

5 years agoBump libdcp for new image subtitle code.
Carl Hetherington [Mon, 9 Jul 2018 01:50:50 +0000 (02:50 +0100)]
Bump libdcp for new image subtitle code.

5 years agoWrite image subs to DCPs.
Carl Hetherington [Sun, 8 Jul 2018 22:26:21 +0000 (23:26 +0100)]
Write image subs to DCPs.

5 years agoFix build with shared_ptr dcp::Subtitle and subclasses.
Carl Hetherington [Sat, 7 Jul 2018 23:54:04 +0000 (00:54 +0100)]
Fix build with shared_ptr dcp::Subtitle and subclasses.

5 years agoAdd export button for cinemas XML (#1319).
Carl Hetherington [Sat, 7 Jul 2018 20:16:41 +0000 (21:16 +0100)]
Add export button for cinemas XML (#1319).

5 years agoGive better errors when incorrect KDMs are used (#1326).
Carl Hetherington [Sat, 7 Jul 2018 18:35:42 +0000 (19:35 +0100)]
Give better errors when incorrect KDMs are used (#1326).

5 years agoFix (odd) crash.
Carl Hetherington [Sat, 7 Jul 2018 00:20:40 +0000 (01:20 +0100)]
Fix (odd) crash.

5 years agoAdd an audio stream to ffmpeg files and support <Image> in hacks/make_dummy_files.
Carl Hetherington [Sat, 7 Jul 2018 00:20:21 +0000 (01:20 +0100)]
Add an audio stream to ffmpeg files and support <Image> in hacks/make_dummy_files.

5 years agoMissing wakeups of the writer thread when we are waiting for it do something. v2.13.34
Carl Hetherington [Fri, 6 Jul 2018 22:31:35 +0000 (23:31 +0100)]
Missing wakeups of the writer thread when we are waiting for it do something.

5 years agoPrevent an unnecessary config file write.
Carl Hetherington [Fri, 6 Jul 2018 21:31:37 +0000 (22:31 +0100)]
Prevent an unnecessary config file write.

5 years agoFix could-not-load-film error when loading a project with a missing subtitle file.
Carl Hetherington [Fri, 6 Jul 2018 19:49:33 +0000 (20:49 +0100)]
Fix could-not-load-film error when loading a project with a missing subtitle file.

5 years agoAdd advanced KDM options button containing switches for forensic marking.
Carl Hetherington [Fri, 6 Jul 2018 19:33:04 +0000 (20:33 +0100)]
Add advanced KDM options button containing switches for forensic marking.

5 years agoLayout tweak.
Carl Hetherington [Fri, 6 Jul 2018 19:31:49 +0000 (20:31 +0100)]
Layout tweak.

5 years agoTweak layout and remove some code duplication.
Carl Hetherington [Fri, 6 Jul 2018 18:37:36 +0000 (19:37 +0100)]
Tweak layout and remove some code duplication.

5 years agoMissing files for RPM builds.
Carl Hetherington [Thu, 5 Jul 2018 19:39:06 +0000 (20:39 +0100)]
Missing files for RPM builds.

5 years agoAnother OS X build tweak. v2.13.33
Carl Hetherington [Thu, 5 Jul 2018 15:10:07 +0000 (16:10 +0100)]
Another OS X build tweak.

5 years agoTry again to fix OS X build.
Carl Hetherington [Thu, 5 Jul 2018 14:33:21 +0000 (15:33 +0100)]
Try again to fix OS X build.

5 years agoTry to fix OS X build.
Carl Hetherington [Thu, 5 Jul 2018 14:08:08 +0000 (15:08 +0100)]
Try to fix OS X build.

5 years agoChangeLog.
Carl Hetherington [Wed, 4 Jul 2018 23:49:41 +0000 (00:49 +0100)]
ChangeLog.

5 years agoMention delay in timeline audio views.
Carl Hetherington [Wed, 4 Jul 2018 23:48:58 +0000 (00:48 +0100)]
Mention delay in timeline audio views.

5 years agoSort audio timeline views in order of DCP audio channel mappings (#1279).
Carl Hetherington [Wed, 4 Jul 2018 23:39:23 +0000 (00:39 +0100)]
Sort audio timeline views in order of DCP audio channel mappings (#1279).

5 years agoAdd audio gain to timeline content view.
Carl Hetherington [Wed, 4 Jul 2018 23:02:06 +0000 (00:02 +0100)]
Add audio gain to timeline content view.

5 years agoLabel audio content with mapping (part of #1279).
Carl Hetherington [Wed, 4 Jul 2018 22:42:21 +0000 (23:42 +0100)]
Label audio content with mapping (part of #1279).

5 years agoChangeLog.
Carl Hetherington [Wed, 4 Jul 2018 21:46:17 +0000 (22:46 +0100)]
ChangeLog.

5 years agoMore zoom / timeline tidying.
Carl Hetherington [Wed, 4 Jul 2018 10:31:22 +0000 (11:31 +0100)]
More zoom / timeline tidying.

5 years agoFix tool crash; try to fix linked scrolling.
Carl Hetherington [Wed, 4 Jul 2018 10:18:21 +0000 (11:18 +0100)]
Fix tool crash; try to fix linked scrolling.

5 years agoToolbar and scrolling tweaks.
Carl Hetherington [Wed, 4 Jul 2018 09:58:01 +0000 (10:58 +0100)]
Toolbar and scrolling tweaks.

5 years agoDebugging.
Carl Hetherington [Wed, 4 Jul 2018 02:05:08 +0000 (03:05 +0100)]
Debugging.

5 years agoDebugging message.
Carl Hetherington [Wed, 4 Jul 2018 01:45:48 +0000 (02:45 +0100)]
Debugging message.

5 years agoWhitespace tweaks.
Carl Hetherington [Wed, 4 Jul 2018 01:44:29 +0000 (02:44 +0100)]
Whitespace tweaks.

5 years agoUse 32x32 toolbar icons.
Carl Hetherington [Wed, 4 Jul 2018 01:37:38 +0000 (02:37 +0100)]
Use 32x32 toolbar icons.

5 years agoReplace checkboxes with tools.
Carl Hetherington [Wed, 4 Jul 2018 01:23:29 +0000 (02:23 +0100)]
Replace checkboxes with tools.

5 years agoFix icons on Windows; zoom to all on initial open.
Carl Hetherington [Wed, 4 Jul 2018 00:15:05 +0000 (01:15 +0100)]
Fix icons on Windows; zoom to all on initial open.

5 years agoTry to fix OSX build.
Carl Hetherington [Tue, 3 Jul 2018 23:54:12 +0000 (00:54 +0100)]
Try to fix OSX build.

5 years agoPossibly install Windows icons correctly.
Carl Hetherington [Tue, 3 Jul 2018 23:53:35 +0000 (00:53 +0100)]
Possibly install Windows icons correctly.

5 years agoAdd zoom-all button.
Carl Hetherington [Tue, 3 Jul 2018 23:51:31 +0000 (00:51 +0100)]
Add zoom-all button.

5 years agoFix scrolling of labels; prevent zooming out too far.
Carl Hetherington [Tue, 3 Jul 2018 23:07:04 +0000 (00:07 +0100)]
Fix scrolling of labels; prevent zooming out too far.

5 years agoFix time axis view length.
Carl Hetherington [Tue, 3 Jul 2018 22:39:36 +0000 (23:39 +0100)]
Fix time axis view length.

5 years agoFix hidden reels view and time axis not moving under zoom.
Carl Hetherington [Tue, 3 Jul 2018 22:31:11 +0000 (23:31 +0100)]
Fix hidden reels view and time axis not moving under zoom.

5 years agoUpdate track labels when zooming out.
Carl Hetherington [Tue, 3 Jul 2018 13:34:38 +0000 (14:34 +0100)]
Update track labels when zooming out.

5 years agoScroll labels view with zoom.
Carl Hetherington [Mon, 2 Jul 2018 22:52:01 +0000 (23:52 +0100)]
Scroll labels view with zoom.

5 years agoy zoom.
Carl Hetherington [Mon, 2 Jul 2018 22:17:37 +0000 (23:17 +0100)]
y zoom.

5 years agoFix drawing.
Carl Hetherington [Mon, 2 Jul 2018 21:55:29 +0000 (22:55 +0100)]
Fix drawing.

5 years agoHacks to stop scrolling track names.
Carl Hetherington [Mon, 2 Jul 2018 15:39:06 +0000 (16:39 +0100)]
Hacks to stop scrolling track names.

5 years agoBasic zoom.
Carl Hetherington [Mon, 2 Jul 2018 14:57:55 +0000 (15:57 +0100)]
Basic zoom.

5 years agoUpdated nl_NL translation from Rob van Nieuwkerk.
Carl Hetherington [Sat, 30 Jun 2018 23:42:10 +0000 (00:42 +0100)]
Updated nl_NL translation from Rob van Nieuwkerk.

5 years agoChangeLog.
Carl Hetherington [Fri, 29 Jun 2018 21:05:59 +0000 (22:05 +0100)]
ChangeLog.

5 years agoBasic jump to selected subtitle (#1200).
Carl Hetherington [Fri, 29 Jun 2018 21:02:19 +0000 (22:02 +0100)]
Basic jump to selected subtitle (#1200).

5 years agopot/merge. v2.13.32
Carl Hetherington [Thu, 28 Jun 2018 23:16:56 +0000 (00:16 +0100)]
pot/merge.

5 years agoPrevent FFmpeg errors if export filenames are specified with no or incorrect extensions.
Carl Hetherington [Thu, 28 Jun 2018 23:05:19 +0000 (00:05 +0100)]
Prevent FFmpeg errors if export filenames are specified with no or incorrect extensions.

5 years agoPrevent setting of negative trims by changing play length.
Carl Hetherington [Wed, 27 Jun 2018 19:21:29 +0000 (20:21 +0100)]
Prevent setting of negative trims by changing play length.

5 years agoAdd some timing logs for playback.
Carl Hetherington [Fri, 22 Jun 2018 00:06:49 +0000 (01:06 +0100)]
Add some timing logs for playback.

5 years agoFix corruption of UTF16 subtitle files.
Carl Hetherington [Thu, 21 Jun 2018 22:02:39 +0000 (23:02 +0100)]
Fix corruption of UTF16 subtitle files.

5 years agoNew tests.
Carl Hetherington [Thu, 21 Jun 2018 22:02:22 +0000 (23:02 +0100)]
New tests.

5 years agoAdd FFmpeg weave filter.
Carl Hetherington [Tue, 12 Jun 2018 13:32:48 +0000 (14:32 +0100)]
Add FFmpeg weave filter.

5 years agoThrow exceptions when things in the butler get really out of hand. v2.13.31
Carl Hetherington [Mon, 11 Jun 2018 11:22:46 +0000 (12:22 +0100)]
Throw exceptions when things in the butler get really out of hand.

5 years agoGarbled CCAP notes.
Carl Hetherington [Sun, 10 Jun 2018 22:38:18 +0000 (23:38 +0100)]
Garbled CCAP notes.

5 years agoBuild fix. v2.13.30
Carl Hetherington [Sun, 10 Jun 2018 00:08:52 +0000 (01:08 +0100)]
Build fix.

5 years agoModify the downmix mapping so that we include Ls, Rs and Lfe (#1281). v2.13.29
Carl Hetherington [Sat, 9 Jun 2018 23:31:35 +0000 (00:31 +0100)]
Modify the downmix mapping so that we include Ls, Rs and Lfe (#1281).

5 years agoFix bad parsing of ASS lines embedded into FFmpeg files and containing commas.
Carl Hetherington [Sat, 9 Jun 2018 22:57:00 +0000 (23:57 +0100)]
Fix bad parsing of ASS lines embedded into FFmpeg files and containing commas.

5 years agoAdd option to open a DCP in the player (#1312).
Carl Hetherington [Sat, 9 Jun 2018 22:43:58 +0000 (23:43 +0100)]
Add option to open a DCP in the player (#1312).

5 years agoSimilarly for start_batch_converter.
Carl Hetherington [Sat, 9 Jun 2018 21:54:54 +0000 (22:54 +0100)]
Similarly for start_batch_converter.

5 years agoFactor out sending a message to another tool (possibly starting it first).
Carl Hetherington [Sat, 9 Jun 2018 21:52:08 +0000 (22:52 +0100)]
Factor out sending a message to another tool (possibly starting it first).

5 years agoAnother writer deadlock fix.
Carl Hetherington [Sat, 9 Jun 2018 21:22:21 +0000 (22:22 +0100)]
Another writer deadlock fix.

5 years agoWhitespace. v2.13.28
Carl Hetherington [Fri, 8 Jun 2018 20:21:39 +0000 (21:21 +0100)]
Whitespace.