summaryrefslogtreecommitdiff
path: root/src/lib/content.cc
AgeCommit message (Collapse)Author
2018-07-23Tidy up after mass rename.Carl Hetherington
2018-07-23More automated renaming.Carl Hetherington
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
2018-07-21Revert "Remove join function; the code is long and I don't think anybody"Carl Hetherington
It turns out Carsten uses it :) This reverts commit bd5e8b83a3a18787241982efdae809d4db21f65d.
2018-07-21Basics of multiple captions per content so that DCPContent canCarl Hetherington
hold subs and closed captions.
2018-07-20Remove join function; the code is long and I don't think anybodyCarl Hetherington
uses it.
2018-07-19Clean up after previous commit.Carl Hetherington
2018-07-19Rename Subtitle -> TextCarl Hetherington
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
2018-07-09Maintain frame-snap for position and trim when set_video_frame_rate is ↵Carl Hetherington
called (#1335).
2018-02-08typeid() doesn't seem to downcast, so just check types in the ↵Carl Hetherington
take_settings_from methods (#1192).
2018-01-14Fix crash when unsetting forced video frame rates in the timing panel.Carl Hetherington
2018-01-05s/use_template/take_settings_from/gCarl Hetherington
2017-12-11Fix various problems caused by non-integer-frame start trims,Carl Hetherington
and also by the inability of content_video_to_dcp to return negative values. The latter is necessary for tests on "is this content too early" to work.
2017-07-12Force video content to start on a frame boundary.Carl Hetherington
2017-05-23Add Content::set_paths().Carl Hetherington
2017-01-04Rename Time::round_up to Time::ceil.Carl Hetherington
2016-08-24Basic template support (#485).Carl Hetherington
2016-08-24Revert "Bump libdcp for new method."Carl Hetherington
This reverts commit 3412af70b950dcdc604413ef05c26becda6da789.
2016-08-24Bump libdcp for new method.Carl Hetherington
2016-08-12Move locale_convert into libdcp.Carl Hetherington
2016-08-12Replace incorrect uses of raw_convert with a new locale_convert.Carl Hetherington
2016-08-12Move raw_convert into libdcp.Carl Hetherington
2016-08-12Remove all use of stringstream in an attempt to fixCarl Hetherington
the suspected thread-unsafe crash bugs on OS X.
2016-07-22Rename SafeStringStream -> locked_stringstream. Bump deps for removal of ↵Carl Hetherington
stringstream.
2016-06-29Tweak content properties layout (#895).Carl Hetherington
2016-06-13Rename MD5Digester -> Digester.Carl Hetherington
2016-06-02Fix missing content properties when using translations.Carl Hetherington
2016-06-01Store video frame rate in XML (#883).Carl Hetherington
2016-05-31Restore some missing stuff to the content properties dialogue.Carl Hetherington
2016-05-25No-op; fix GPL address and use the explicit-program-name version.Carl Hetherington
2016-05-18Move video frame rate ('prepared-for') into Content.Carl Hetherington
2016-05-18Fix crash on emitting a signal during a constructor.Carl Hetherington
2016-05-18Split audio; builds.Carl Hetherington
2016-05-18Move UserProperty into its own file.Carl Hetherington
2016-02-18Various improvements to the content properties dialogue (including #791).Carl Hetherington
2016-02-16Move reel_split_points from VideoContent to Content.Carl Hetherington
2015-11-06Clean up a bit by using Content::film() more.Carl Hetherington
2015-09-16Back-end for very basic and hacky VF support for a DCP imported as content.Carl Hetherington
2015-09-14Lots of #include <iostream>s for Arch.Carl Hetherington
2015-08-18Include tidying.Carl Hetherington
2015-07-19Fix daft mistake in time fixups causing end trim to be added to length.Carl Hetherington
2015-07-14Express trims using ContentTime so that they do not changeCarl Hetherington
when DCP frame rate is changed (#637).
2015-06-21Add more video properties to content properties dialog.Carl Hetherington
Also implement the whole properties thing more neatly.
2015-06-21No-op: remove all trailing whitespace.Carl Hetherington
2015-06-19No-op; variable renaming.Carl Hetherington
2015-06-02Handle multiple audio streams in a single piece of contentCarl Hetherington
in a similar way to the V1 patch.
2015-05-13Rename UISignaller -> SignalManager.Carl Hetherington
2015-05-13Fix crashes on x-thread signal emission.Carl Hetherington
Fix crashes on x-thread signal emission if the emitting object is destroyed between the storage of the message on the queue and the emission of the object in the UI thread.
2015-04-16Add our own raw_convert that uses SafeStringStream.Carl Hetherington
2015-01-24Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker ↵Carl Hetherington
digest calculation.
2014-12-20Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all ↵Carl Hetherington
assert()s with thrown exceptions.