X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=ea81ae939bb85e181e557502e1258921543f8849;hb=ca981c8cfa23111e92be329f1c2dfbe3a07b4247;hp=2fd7c8668a914125dc6308968393d3bf1d79c806;hpb=af0edaf7dcd36c367cb585c98e8413c5347a7386;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index 2fd7c8668..ea81ae939 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,11 +21,13 @@
 #ifndef DCPOMATIC_PLAYER_H
 #define DCPOMATIC_PLAYER_H
 
+#include "atmos_metadata.h"
 #include "player_text.h"
 #include "active_text.h"
 #include "content_text.h"
 #include "film.h"
 #include "content.h"
+#include "content_atmos.h"
 #include "position_image.h"
 #include "piece.h"
 #include "content_video.h"
@@ -35,6 +37,7 @@
 #include "empty.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
+#include <boost/atomic.hpp>
 #include <list>
 
 namespace dcp {
@@ -45,6 +48,7 @@ namespace dcpomatic {
 	class Font;
 }
 
+class AtmosContent;
 class PlayerVideo;
 class Playlist;
 class AudioBuffers;
@@ -59,6 +63,7 @@ public:
 	static int const FILM_CONTAINER;
 	static int const FILM_VIDEO_FRAME_RATE;
 	static int const DCP_DECODE_REDUCTION;
+	static int const PLAYBACK_LENGTH;
 };
 
 /** @class Player
@@ -67,6 +72,7 @@ public:
 class Player : public boost::enable_shared_from_this<Player>, public boost::noncopyable
 {
 public:
+	Player (boost::shared_ptr<const Film>);
 	Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist> playlist);
 	~Player ();
 
@@ -100,6 +106,7 @@ public:
 	 *  after the corresponding Video.
 	 */
 	boost::signals2::signal<void (PlayerText, TextType, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod)> Text;
+	boost::signals2::signal<void (boost::shared_ptr<const dcp::AtmosFrame>, dcpomatic::DCPTime, AtmosMetadata)> Atmos;
 
 private:
 	friend class PlayerWrapper;
@@ -112,6 +119,7 @@ private:
 	friend struct empty_test2;
 	friend struct check_reuse_old_data_test;
 
+	void construct ();
 	void setup_pieces ();
 	void setup_pieces_unlocked ();
 	void flush ();
@@ -125,11 +133,14 @@ private:
 	dcpomatic::ContentTime dcp_to_content_time (boost::shared_ptr<const Piece> piece, dcpomatic::DCPTime t) const;
 	dcpomatic::DCPTime content_time_to_dcp (boost::shared_ptr<const Piece> piece, dcpomatic::ContentTime t) const;
 	boost::shared_ptr<PlayerVideo> black_player_video_frame (Eyes eyes) const;
+
 	void video (boost::weak_ptr<Piece>, ContentVideo);
 	void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio);
 	void bitmap_text_start (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, ContentBitmapText);
 	void plain_text_start (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, ContentStringText);
 	void subtitle_stop (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, dcpomatic::ContentTime);
+	void atmos (boost::weak_ptr<Piece>, ContentAtmos);
+
 	dcpomatic::DCPTime one_video_frame () const;
 	void fill_audio (dcpomatic::DCPTimePeriod period);
 	std::pair<boost::shared_ptr<AudioBuffers>, dcpomatic::DCPTime> discard_audio (
@@ -139,6 +150,7 @@ private:
 	void emit_video (boost::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
 	void do_emit_video (boost::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
 	void emit_audio (boost::shared_ptr<AudioBuffers> data, dcpomatic::DCPTime time);
+	boost::shared_ptr<const Playlist> playlist () const;
 
 	/** Mutex to protect the whole Player state.  When it's used for the preview we have
 	    seek() and pass() called from the Butler thread and lots of other stuff called
@@ -147,13 +159,16 @@ private:
 	mutable boost::mutex _mutex;
 
 	boost::shared_ptr<const Film> _film;
+	/** Playlist, or 0 if we are using the one from the _film */
 	boost::shared_ptr<const Playlist> _playlist;
 
-	/** true if we are suspended (i.e. pass() and seek() do nothing) */
-	bool _suspended;
+	/** > 0 if we are suspended (i.e. pass() and seek() do nothing) */
+	boost::atomic<int> _suspended;
 	std::list<boost::shared_ptr<Piece> > _pieces;
 
-	/** Size of the image in the DCP (e.g. 1990x1080 for flat) */
+	/** Size of the image we are rendering to; this may be the DCP frame size, or
+	 *  the size of preview in a window.
+	 */
 	dcp::Size _video_container_size;
 	boost::shared_ptr<Image> _black_image;
 
@@ -206,8 +221,7 @@ private:
 	ActiveText _active_texts[TEXT_COUNT];
 	boost::shared_ptr<AudioProcessor> _audio_processor;
 
-	/* Cached stuff */
-	boost::optional<dcpomatic::DCPTime> _film_length;
+	dcpomatic::DCPTime _playback_length;
 
 	boost::signals2::scoped_connection _film_changed_connection;
 	boost::signals2::scoped_connection _playlist_change_connection;