summaryrefslogtreecommitdiff
path: root/src/lib/playlist.cc
AgeCommit message (Collapse)Author
2021-07-10Use dcp::compose rather than our own.composeCarl Hetherington
2021-02-16C++11 tidying.Carl Hetherington
2021-01-31More enum class additions.Carl Hetherington
2021-01-07BOOST_FOREACH.Carl Hetherington
2021-01-07std::shared_ptrCarl Hetherington
2020-09-01Build fixes for Boost >= 1.73Carl Hetherington
Forward-ported-from: d1e9749ca290673639a49d693a8fe5c6557cc2de
2020-06-05This AtomicityChecker was introduced a long time ago for reasonsCarl Hetherington
that are unclear. This commit removes it because it was causing a bug whereby the _suspended count on Butler would not go back down to 0 due to signals being blocked by the AtomicityChecker. I can see two possibilities: 1. AtomicityChecker is a band-aid for some deeper problem, in which case other bugs will become apparent. Perhaps it relates to signals being sent before the butler/player/playlist are connected to content. 2. AtomicityChecker was correct but was not identifiying signals from different pieces of content correctly; so the correct fix would be to add the content pointer to the _checker.send() call and block based also on that.
2020-01-08Naming tweak.Carl Hetherington
2020-01-08Clean up access to stuff from Film.Carl Hetherington
2019-05-10Put Time types in dcpomatic namespace.Carl Hetherington
2019-03-13Fix locking of Playlist to protect against access from the GUI threadCarl Hetherington
and at the same time traces like Butler -> Content::end -> Playlist::active_frame_rate_change.
2019-01-26Suggest that DCP rates <= 30 are used unless the user explictly goes higher ↵Carl Hetherington
(#1441).
2018-12-14swaroop: fix up restart-after-crash.v2.13.84Carl Hetherington
2018-11-21Remove Film pointer from clone().Carl Hetherington
2018-11-21Take Film pointer out of Content.Carl Hetherington
2018-08-19Replace May/Done/NotDone signal sets with one signal and extendCarl Hetherington
this treatment to anything that caused Player::setup_pieces. This should fix out-of-sequence Player emissions caused by setup_pieces being called by one thread while the butler is calling pass().
2018-08-14More fixes for errors / crashes / misbehaviour with content changesCarl Hetherington
and the butler. Here we signal both before and after a change in content. Before, the player disables itself so that any pass()/seek() will be no-ops. After, the player rebuilds its pieces and the butler re-seeks to get back to where it was before the change.
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-21Basics of multiple captions per content so that DCPContent canCarl Hetherington
hold subs and closed captions.
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-09Sequence content after trim changes (#1327). This gives me a slightCarl Hetherington
sense of unease but let's see how it goes.
2018-02-27Remove some unused code.Carl Hetherington
2017-06-29Fixes for silence in projects, various cleanups.Carl Hetherington
2017-06-23Attempts to simplify black-filling logic in Player.Carl Hetherington
2017-05-13Fill audio in the Player.Carl Hetherington
2017-04-30Try to improve hint when making a DCP which is not 24 or 48fps.Carl Hetherington
2017-04-19Various Doxygen fixes.Carl Hetherington
2017-04-19Various work on the audio code.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-07-31Allow configuration of MXF/XML filenames (part of #710).Carl Hetherington
2016-06-13Rename MD5Digester -> Digester.Carl Hetherington
2016-05-25No-op; fix GPL address and use the explicit-program-name version.Carl Hetherington
2016-05-18Remove Sndfile code and use FFmpeg instead.Carl Hetherington
2016-05-18Various text fixes.Carl Hetherington
2016-05-18Move video frame rate ('prepared-for') into Content.Carl Hetherington
2016-05-18Rename video/audio/subtitle part methods.Carl Hetherington
2016-05-18Split audio; builds.Carl Hetherington
2016-05-18Subtitle rearrangements.Carl Hetherington
2016-05-18Basics of subtitle split.Carl Hetherington
2016-05-18Reasonably straightforward stuff; main things are addingCarl Hetherington
a _parent to VideoContent (mainly, but not only, for signalling) and moving the video shared_ptr into Content, which makes much more sense to replace dynamic_cast tests for whether something has video or whatever. Nearly builds.
2016-02-24Fix sequencing when there is video+subtitle content.Carl Hetherington
2016-02-24An unfortunately large set of timeline-related changes:Carl Hetherington
- Rename sequence_video to sequence, and sequence subtitle content like we do video content (i.e. adding multiple subtitle contents will result in them sequenced in time rather than overlaid). - Stop doing selection-changed related stuff in ContentPanel if no selection change has actually happened. - Attempt to tidy up event handling in the timeline a bit.
2016-01-31Fix set_position() causing a re-sort.Carl Hetherington
2016-01-30Add a PlaylistOrderChanged signal and emit it when the playlistCarl Hetherington
is sorted. Do playlist sorting when content position / length etc. changes. Handle sorts better when comparing content at the same position.
2016-01-23Fix estimate of required disk space to take referencingCarl Hetherington
of existing DCPs into account.
2015-11-06Allow single-frame image contents to adjust their video frame rates to that ↵Carl Hetherington
of the DCP (fixes #714).
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-05 22:23:14 +0000