/*
Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
class Playlist;
class Font;
class AudioBuffers;
+class ReferencedReelAsset;
/** @class Player
* @brief A class which can `play' a Playlist.
std::list<boost::shared_ptr<PlayerVideo> > get_video (DCPTime time, bool accurate);
boost::shared_ptr<AudioBuffers> get_audio (DCPTime time, DCPTime length, bool accurate);
- PlayerSubtitles get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt);
+ PlayerSubtitles get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt, bool accurate);
std::list<boost::shared_ptr<Font> > get_subtitle_fonts ();
- std::list<boost::shared_ptr<dcp::ReelAsset> > get_reel_assets ();
+ std::list<ReferencedReelAsset> get_reel_assets ();
void set_video_container_size (dcp::Size);
void set_ignore_video ();
friend struct player_time_calculation_test3;
void setup_pieces ();
+ void reset_pieces ();
void flush ();
void film_changed (Film::Property);
void playlist_changed ();
DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const;
Frame dcp_to_resampled_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const;
ContentTime dcp_to_content_subtitle (boost::shared_ptr<const Piece> piece, DCPTime t) const;
+ DCPTime content_subtitle_to_dcp (boost::shared_ptr<const Piece> piece, ContentTime t) const;
boost::shared_ptr<PlayerVideo> black_player_video_frame (DCPTime) const;
-
- /** @return Pieces of content type C that overlap a specified time range in the DCP */
- template<class C>
- std::list<boost::shared_ptr<Piece> >
- overlaps (DCPTime from, DCPTime to)
- {
- if (!_have_valid_pieces) {
- setup_pieces ();
- }
-
- std::list<boost::shared_ptr<Piece> > overlaps;
- for (typename std::list<boost::shared_ptr<Piece> >::const_iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
- if (!boost::dynamic_pointer_cast<C> ((*i)->content)) {
- continue;
- }
-
- if ((*i)->content->position() <= to && (*i)->content->end() >= from) {
- overlaps.push_back (*i);
- }
- }
-
- return overlaps;
- }
+ std::list<boost::shared_ptr<Piece> > overlaps (DCPTime from, DCPTime to, boost::function<bool (Content *)> valid);
boost::shared_ptr<const Film> _film;
boost::shared_ptr<const Playlist> _playlist;