Carl Hetherington [Wed, 25 Jul 2018 23:11:35 +0000 (00:11 +0100)]
Use GNOME `sdk' instead of `platform' for flatpak.
Carl Hetherington [Wed, 25 Jul 2018 22:09:37 +0000 (23:09 +0100)]
Use cdist's flatpak tools.
Carl Hetherington [Wed, 25 Jul 2018 21:58:15 +0000 (22:58 +0100)]
Try not building icu.
Carl Hetherington [Wed, 25 Jul 2018 22:50:30 +0000 (23:50 +0100)]
Add believed-necessary locking to ActiveText.
Carl Hetherington [Wed, 25 Jul 2018 22:50:15 +0000 (23:50 +0100)]
Fix crash on scaling the ccap window to be very small.
Carl Hetherington [Wed, 25 Jul 2018 21:11:20 +0000 (22:11 +0100)]
Try to put version number into flatpak bundle name.
Carl Hetherington [Wed, 25 Jul 2018 08:27:02 +0000 (09:27 +0100)]
Add flatpak build.
Carl Hetherington [Wed, 25 Jul 2018 20:07:29 +0000 (21:07 +0100)]
Restore AWOL timing panel.
Carl Hetherington [Wed, 25 Jul 2018 15:59:37 +0000 (16:59 +0100)]
Make characters red if they are too long in the closed caption view.
Carl Hetherington [Wed, 25 Jul 2018 13:00:19 +0000 (14:00 +0100)]
Fix loading of old projects.
Carl Hetherington [Wed, 25 Jul 2018 12:54:10 +0000 (13:54 +0100)]
Fix problems with loading projects with captions / subs.
Carl Hetherington [Wed, 25 Jul 2018 12:53:52 +0000 (13:53 +0100)]
Add some asserts.
Carl Hetherington [Tue, 24 Jul 2018 22:04:01 +0000 (23:04 +0100)]
Don't start with all possible content tabs visible.
Carl Hetherington [Tue, 24 Jul 2018 22:03:45 +0000 (23:03 +0100)]
Tweak debug message.
Carl Hetherington [Tue, 24 Jul 2018 14:25:56 +0000 (15:25 +0100)]
Update ImageMagick URL for flatpak.
Carl Hetherington [Tue, 24 Jul 2018 11:14:32 +0000 (12:14 +0100)]
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Tue, 24 Jul 2018 11:14:27 +0000 (12:14 +0100)]
Fix uninitialised variable.
Carl Hetherington [Tue, 24 Jul 2018 09:18:44 +0000 (10:18 +0100)]
Fix image filename sorter with filenames that have lots of numbers.
Carl Hetherington [Mon, 23 Jul 2018 15:42:28 +0000 (16:42 +0100)]
Introduce the idea of unknown original subtitle type to clean up the GUI a bit.
Carl Hetherington [Mon, 23 Jul 2018 14:10:11 +0000 (15:10 +0100)]
Tidy up after mass rename.
Carl Hetherington [Mon, 23 Jul 2018 10:20:12 +0000 (11:20 +0100)]
More automated renaming.
ActiveCaptions -> ActiveText
BitmapCaption -> BitmapText
ContentCaption -> ContentText
ContentTextCaption -> ContentStringText
TextCaptionFileContent -> StringTextFileContent
TextCaptionFileDecoder -> StringTextFileDecoder
TextCaptionFile -> StringTextFile
TextCaption -> StringText
PlayerCaption -> PlayerText
CaptionContent -> TextContent
CaptionDecoder -> TextDecoder
CaptionPanel -> TextPanel
CaptionView -> TextView
CaptionAppearanceDialog -> SubtitleAppearanceDialog
CaptionType -> TextType
Carl Hetherington [Mon, 23 Jul 2018 08:50:29 +0000 (09:50 +0100)]
Update to test/data.
Carl Hetherington [Mon, 23 Jul 2018 08:48:36 +0000 (09:48 +0100)]
Some missing bits of caption type setup.
Carl Hetherington [Mon, 23 Jul 2018 01:04:30 +0000 (02:04 +0100)]
Commenting.
Carl Hetherington [Mon, 23 Jul 2018 00:21:07 +0000 (01:21 +0100)]
Get ccaps by asking the Player, rather than by listening to its emissions,
which is slightly cleaner and works when subtitles are emitted with an
unknown end time. Also add CCAPs to the player.
Carl Hetherington [Sun, 22 Jul 2018 23:18:17 +0000 (00:18 +0100)]
Remove debug code.
Carl Hetherington [Sun, 22 Jul 2018 23:09:35 +0000 (00:09 +0100)]
Very basic closed caption viewer.
Carl Hetherington [Sun, 22 Jul 2018 20:53:22 +0000 (21:53 +0100)]
No-op: white space.
Carl Hetherington [Sun, 22 Jul 2018 20:29:40 +0000 (21:29 +0100)]
On reflection showing CCAPs over the main picture doesn't make much sense.
Carl Hetherington [Sat, 21 Jul 2018 23:41:03 +0000 (00:41 +0100)]
Display only required tabs, including subs / ccap.
Carl Hetherington [Sat, 21 Jul 2018 21:14:15 +0000 (22:14 +0100)]
Fix failure to load projects.
Carl Hetherington [Sat, 21 Jul 2018 21:09:29 +0000 (22:09 +0100)]
Fix join for new caption stuff.
Carl Hetherington [Sat, 21 Jul 2018 21:09:04 +0000 (22:09 +0100)]
Fix crash.
Carl Hetherington [Sat, 21 Jul 2018 20:47:25 +0000 (21:47 +0100)]
Revert "Remove join function; the code is long and I don't think anybody"
It turns out Carsten uses it :)
This reverts commit
bd5e8b83a3a18787241982efdae809d4db21f65d.
Carl Hetherington [Sat, 21 Jul 2018 14:16:18 +0000 (15:16 +0100)]
Basics of multiple captions per content so that DCPContent can
hold subs and closed captions.
Carl Hetherington [Fri, 20 Jul 2018 22:16:40 +0000 (23:16 +0100)]
Key ActiveCaptions on a CaptionContent rather than a Piece.
Carl Hetherington [Fri, 20 Jul 2018 21:12:37 +0000 (22:12 +0100)]
Thinko in previous.
Carl Hetherington [Fri, 20 Jul 2018 21:11:09 +0000 (22:11 +0100)]
Put caption details inside their own tag in the metadata.
Carl Hetherington [Fri, 20 Jul 2018 20:28:29 +0000 (21:28 +0100)]
Remove join function; the code is long and I don't think anybody
uses it.
Carl Hetherington [Fri, 20 Jul 2018 19:40:59 +0000 (20:40 +0100)]
Update preview when caption type changes.
Carl Hetherington [Fri, 20 Jul 2018 18:55:22 +0000 (19:55 +0100)]
Untested; allow viewing of subtitles or closed captions in the preview.
Carl Hetherington [Fri, 20 Jul 2018 14:20:56 +0000 (15:20 +0100)]
Add advanced configuration option to allow any container ratio,
specifically because the GDC SX-2001 will only play 25fps DCPs
with a 16:9 ratio (not Flat).
https://www.dcpomatic.com/forum/viewtopic.php?f=2&t=1119&p=4470
Carl Hetherington [Fri, 20 Jul 2018 12:48:37 +0000 (13:48 +0100)]
Fix incorrect type name.
Carl Hetherington [Thu, 19 Jul 2018 23:42:20 +0000 (00:42 +0100)]
Hopefully remove unsafe-loop-optimization warnings.
Carl Hetherington [Thu, 19 Jul 2018 23:16:15 +0000 (00:16 +0100)]
caption -> subtitle.
Carl Hetherington [Thu, 19 Jul 2018 23:08:13 +0000 (00:08 +0100)]
ChangeLog update.
Carl Hetherington [Thu, 19 Jul 2018 22:36:49 +0000 (23:36 +0100)]
Add very basic test.
Carl Hetherington [Thu, 19 Jul 2018 22:20:57 +0000 (23:20 +0100)]
Untested writing of CCAP.
Carl Hetherington [Thu, 19 Jul 2018 21:53:27 +0000 (22:53 +0100)]
White space.
Carl Hetherington [Thu, 19 Jul 2018 21:49:14 +0000 (22:49 +0100)]
More subtitle -> caption.
Carl Hetherington [Thu, 19 Jul 2018 21:47:38 +0000 (22:47 +0100)]
Rename subtitle appearance dialogue.
Carl Hetherington [Thu, 19 Jul 2018 21:44:53 +0000 (22:44 +0100)]
Clean up after previous commit.
Carl Hetherington [Thu, 19 Jul 2018 20:48:27 +0000 (21:48 +0100)]
Reword again: Text -> Caption and Plain -> Text.
sed -i "s/ActiveText/ActiveCaptions/g" src/lib/*.{cc,h}
sed -i "s/active_text.h/active_captions.h/g" src/lib/*.{cc,h}
sed -i "s/active_text.cc/active_captions.cc/g" src/lib/wscript
mv src/lib/active_text.cc src/lib/active_captions.cc
mv src/lib/active_text.h src/lib/active_captions.h
sed -i "s/PlainTextFileContent/TextCaptionFileContent/g" src/lib/*.{cc,h} src/wx/*.cc
sed -i "s/PlainTextFile/TextCaptionFile/g" src/lib/*.{cc,h} src/wx/*.cc
sed -i "s/plain_text_file_content/text_caption_file_content/g" src/lib/*.{cc,h} src/lib/wscript src/wx/*.{cc,h} test/*.cc
mv src/lib/plain_text_file_content.cc src/lib/text_caption_file_content.cc
mv src/lib/plain_text_file_content.h src/lib/text_caption_file_content.h
sed -i "s/PlainTextFileDecoder/TextCaptionFileDecoder/g" src/lib/*.{cc,h}
sed -i "s/plain_text_file_decoder/text_caption_file_decoder/g" src/lib/*.{cc,h} src/lib/wscript src/wx/*.{cc,h}
mv src/lib/plain_text_file_decoder.cc src/lib/text_caption_file_decoder.cc
mv src/lib/plain_text_file_decoder.h src/lib/text_caption_file_decoder.h
sed -i "s/PlayerText/PlayerCaption/g" src/lib/*.{cc,h}
sed -i "s/player_text.cc/player_caption.cc/g" src/lib/wscript
sed -i "s/player_text.h/player_caption.h/g" src/lib/*.{cc,h}
mv src/lib/player_text.cc src/lib/player_caption.cc
mv src/lib/player_text.h src/lib/player_caption.h
sed -i "s/ContentPlainText/ContentTextCaption/g" src/lib/*.{cc,h} src/wx/*.{cc,h}
sed -i "s/ContentBitmapText/ContentBitmapCaption/g" src/lib/*.{cc,h} src/wx/*.{cc,h}
sed -i "s/PlainText/TextCaption/g" src/lib/*.{cc,h} test/*.cc
sed -i "s/plain_text.h/text_caption.h/g" src/lib/*.{cc,h}
mv src/lib/plain_text.h src/lib/text_caption.h
Carl Hetherington [Thu, 19 Jul 2018 20:46:20 +0000 (21:46 +0100)]
Fix warning.
Carl Hetherington [Thu, 19 Jul 2018 20:33:52 +0000 (21:33 +0100)]
Get types into ReelWriter.
Carl Hetherington [Thu, 19 Jul 2018 20:23:26 +0000 (21:23 +0100)]
Text to player with types.
Carl Hetherington [Thu, 19 Jul 2018 19:58:24 +0000 (20:58 +0100)]
UI for selecting caption type.
Carl Hetherington [Thu, 19 Jul 2018 19:10:45 +0000 (20:10 +0100)]
Finish PlayerSubtitles -> PlayerText and SubtitleString -> PlainText.
Carl Hetherington [Thu, 19 Jul 2018 18:58:55 +0000 (19:58 +0100)]
Remove unused file.
Carl Hetherington [Thu, 19 Jul 2018 18:58:30 +0000 (19:58 +0100)]
Partial conversion of PlayerSubtitles -> PlayerText and SubtitleString -> PlainText.
Carl Hetherington [Thu, 19 Jul 2018 13:36:04 +0000 (14:36 +0100)]
PlainText -> PlainTextFile.
Carl Hetherington [Thu, 19 Jul 2018 12:44:59 +0000 (13:44 +0100)]
Remove old content_subtitle.
Carl Hetherington [Thu, 19 Jul 2018 12:14:29 +0000 (13:14 +0100)]
Remove -j4 from suggested build copmmand.
Carl Hetherington [Thu, 19 Jul 2018 00:09:19 +0000 (01:09 +0100)]
More renaming.
Carl Hetherington [Thu, 19 Jul 2018 00:04:04 +0000 (01:04 +0100)]
More old stuff.
Carl Hetherington [Thu, 19 Jul 2018 00:02:41 +0000 (01:02 +0100)]
Remove unused file.
Carl Hetherington [Wed, 18 Jul 2018 23:59:52 +0000 (00:59 +0100)]
Missing file.
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
Carl Hetherington [Wed, 18 Jul 2018 22:41:07 +0000 (23:41 +0100)]
Comment tweak.
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
Carl Hetherington [Wed, 18 Jul 2018 22:13:48 +0000 (23:13 +0100)]
Merge master.
Carl Hetherington [Thu, 21 Jun 2018 21:33:02 +0000 (22:33 +0100)]
Add type for text content (CCAP/subtitle).
Carl Hetherington [Mon, 11 Jun 2018 23:20:55 +0000 (00:20 +0100)]
More CCAP notes.
Carl Hetherington [Mon, 11 Jun 2018 23:13:27 +0000 (00:13 +0100)]
More design musings.
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
Carl Hetherington [Mon, 11 Jun 2018 22:35:22 +0000 (23:35 +0100)]
CCAP doc tweaks.
Carl Hetherington [Thu, 19 Jul 2018 18:46:40 +0000 (19:46 +0100)]
Updated fr_FR translation from Thierry Journet.
Carl Hetherington [Wed, 18 Jul 2018 21:39:04 +0000 (22:39 +0100)]
Tidying up of scrolling in the matrix view.
Carl Hetherington [Wed, 18 Jul 2018 19:43:50 +0000 (20:43 +0100)]
Add new graphic.
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
Carl Hetherington [Wed, 18 Jul 2018 08:52:41 +0000 (09:52 +0100)]
Updated de_DE translation from Carsten Kurz.
Carl Hetherington [Wed, 18 Jul 2018 00:32:42 +0000 (01:32 +0100)]
Add some asserts.
Carl Hetherington [Mon, 16 Jul 2018 23:00:19 +0000 (00:00 +0100)]
Fix test.
Carl Hetherington [Mon, 16 Jul 2018 11:28:43 +0000 (12:28 +0100)]
Fix unit tests since sequencing after trim was added.
Carl Hetherington [Mon, 16 Jul 2018 00:50:09 +0000 (01:50 +0100)]
Fix previous.
Carl Hetherington [Mon, 16 Jul 2018 00:48:54 +0000 (01:48 +0100)]
Test output name tweaks.
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.
Carl Hetherington [Sat, 14 Jul 2018 23:04:42 +0000 (00:04 +0100)]
Bump libdcp for test hang fix.
Carl Hetherington [Sat, 14 Jul 2018 22:16:11 +0000 (23:16 +0100)]
Assume .jpf is an image (JPEG2000).
Carl Hetherington [Sat, 14 Jul 2018 21:18:37 +0000 (22:18 +0100)]
Stop the build if we can't download the supporters' list.
Carl Hetherington [Sat, 14 Jul 2018 20:52:32 +0000 (21:52 +0100)]
Fix update check (#1338).
Carl Hetherington [Mon, 9 Jul 2018 20:28:56 +0000 (21:28 +0100)]
Try to fix Centos build.
Carl Hetherington [Mon, 9 Jul 2018 19:10:09 +0000 (20:10 +0100)]
Don't write multiple <LoadFont> tags to Interop subtitles (#1273).
Carl Hetherington [Mon, 9 Jul 2018 14:53:59 +0000 (15:53 +0100)]
ChangeLog typo.
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.
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).
Carl Hetherington [Mon, 9 Jul 2018 10:47:38 +0000 (11:47 +0100)]
Try to fix build on Fedora 28.
Carl Hetherington [Mon, 9 Jul 2018 09:31:27 +0000 (10:31 +0100)]
Try to fix OS X build.
Carl Hetherington [Mon, 9 Jul 2018 09:05:50 +0000 (10:05 +0100)]
Bump libsub for build fix.
Carl Hetherington [Mon, 9 Jul 2018 01:50:50 +0000 (02:50 +0100)]
Bump libdcp for new image subtitle code.