X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=cb3403c3d5ae4c9cabe90f865d38bbe3032e5fe5;hb=b064fa7e95ad31accffafc21a28fa7ede0161212;hp=a795f8174323002900ece524f1cffcad88309cdd;hpb=44c918a83e1e64922448ba20b5dfdcf30d026f84;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index a795f8174..cb3403c3d 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -1,49 +1,44 @@
 /*
     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/>.
 
 */
 
 #ifndef DCPOMATIC_PLAYER_H
 #define DCPOMATIC_PLAYER_H
 
-#include "content.h"
+#include "player_subtitles.h"
 #include "film.h"
-#include "rect.h"
-#include "audio_content.h"
-#include "dcpomatic_time.h"
-#include "content_subtitle.h"
+#include "content.h"
 #include "position_image.h"
 #include "piece.h"
-#include "content_video.h"
-#include "player_subtitles.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <list>
 
-class Job;
-class Film;
-class AudioContent;
-class Piece;
-class Image;
-class Decoder;
-class Resampler;
+namespace dcp {
+	class ReelAsset;
+}
+
 class PlayerVideo;
-class ImageProxy;
+class Playlist;
 class Font;
+class AudioBuffers;
+class ReferencedReelAsset;
 
 /** @class Player
  *  @brief A class which can `play' a Playlist.
@@ -55,13 +50,17 @@ public:
 
 	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<ReferencedReelAsset> get_reel_assets ();
 
 	void set_video_container_size (dcp::Size);
 	void set_ignore_video ();
+	void set_ignore_audio ();
 	void set_enable_subtitles (bool enable);
 	void set_always_burn_subtitles (bool burn);
+	void set_fast ();
+	void set_play_referenced ();
 
 	/** Emitted when something has changed such that if we went back and emitted
 	 *  the last frame again it would look different.  This is not emitted after
@@ -80,6 +79,7 @@ private:
 	friend struct player_time_calculation_test3;
 
 	void setup_pieces ();
+	void reset_pieces ();
 	void flush ();
 	void film_changed (Film::Property);
 	void playlist_changed ();
@@ -90,30 +90,9 @@ private:
 	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;
@@ -128,10 +107,16 @@ private:
 
 	/** true if the player should ignore all video; i.e. never produce any */
 	bool _ignore_video;
+	/** true if the player should ignore all audio; i.e. never produce any */
+	bool _ignore_audio;
 	/** true if the player should always burn subtitles into the video regardless
 	    of content settings
 	*/
 	bool _always_burn_subtitles;
+	/** true if we should try to be fast rather than high quality */
+	bool _fast;
+	/** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */
+	bool _play_referenced;
 
 	boost::shared_ptr<AudioProcessor> _audio_processor;