X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=c0e0f9f70f3aa0daa996e4224354f3d06b45b018;hb=de2af791bdfdcd653752cba970e59efc7bf810c7;hp=842c2283c7da034c89771bb151b9b317bc9bc0aa;hpb=f26af8112b03b5233eb5239defd11a7428b705ad;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index 842c2283c..c0e0f9f70 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -1,19 +1,20 @@
 /*
     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/>.
 
 */
 
@@ -25,14 +26,22 @@
 #include "content.h"
 #include "position_image.h"
 #include "piece.h"
+#include "content_video.h"
+#include "content_audio.h"
+#include "content_subtitle.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <list>
 
+namespace dcp {
+	class ReelAsset;
+}
+
 class PlayerVideo;
 class Playlist;
 class Font;
 class AudioBuffers;
+class ReferencedReelAsset;
 
 /** @class Player
  *  @brief A class which can `play' a Playlist.
@@ -42,10 +51,11 @@ class Player : public boost::enable_shared_from_this<Player>, public boost::nonc
 public:
 	Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist> 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);
+	bool pass ();
+	void seek (DCPTime time, 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 ();
@@ -53,6 +63,7 @@ public:
 	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
@@ -62,6 +73,10 @@ public:
 	 */
 	boost::signals2::signal<void (bool)> Changed;
 
+	boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>)> Video;
+	boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, DCPTime)> Audio;
+	boost::signals2::signal<void (PlayerSubtitles)> Subtitle;
+
 private:
 	friend class PlayerWrapper;
 	friend class Piece;
@@ -81,30 +96,13 @@ 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);
+	void video (boost::weak_ptr<Piece>, ContentVideo);
+	void audio (boost::weak_ptr<Piece>, ContentAudio);
+	void image_subtitle (boost::weak_ptr<Piece>, ContentImageSubtitle);
+	void text_subtitle (boost::weak_ptr<Piece>, ContentTextSubtitle);
 
 	boost::shared_ptr<const Film> _film;
 	boost::shared_ptr<const Playlist> _playlist;
@@ -127,6 +125,10 @@ private:
 	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;
+
+	DCPTime _last_video;
 
 	boost::shared_ptr<AudioProcessor> _audio_processor;