Move video level conversion for RGB from FFmpegImageProxy to Image.

[dcpomatic.git] / src / lib / player.h

diff --git a/src/lib/player.h b/src/lib/player.h
index 0b0c9facdf4eeaa2184034f18196d54f9d074565..8fc02d9c676312829ce8fb2ee497bf9c0ebeefd2 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -67,13 +67,16 @@ public:
 /** @class Player
  *  @brief A class which can play a Playlist.
  */
-class Player : public std::enable_shared_from_this<Player>, public boost::noncopyable
+class Player : public std::enable_shared_from_this<Player>
 {
 public:
        Player (std::shared_ptr<const Film>);
        Player (std::shared_ptr<const Film>, std::shared_ptr<const Playlist> playlist);
        ~Player ();
 
+       Player (Player const& Player) = delete;
+       Player& operator= (Player const& Player) = delete;
+
        bool pass ();
        void seek (dcpomatic::DCPTime time, bool accurate);
 
@@ -99,6 +102,9 @@ public:
 
        /** Emitted when a video frame is ready.  These emissions happen in the correct order. */
        boost::signals2::signal<void (std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime)> Video;
+       /** Emitted when audio data is ready.  First parameter is the audio data, second its time,
+        *  third the frame rate.
+        */
        boost::signals2::signal<void (std::shared_ptr<AudioBuffers>, dcpomatic::DCPTime, int)> Audio;
        /** Emitted when a text is ready.  This signal may be emitted considerably
         *  after the corresponding Video.
@@ -116,6 +122,7 @@ private:
        friend struct empty_test1;
        friend struct empty_test2;
        friend struct check_reuse_old_data_test;
+       friend struct overlap_video_test1;
 
        void construct ();
        void setup_pieces ();