Tell user we need a KDM when we have none, and content is encrypted.

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index faf5d6832637f12be510028a78568615f3275a27..df0007ddfd9676a6d25ac69699e5e131575911e0 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,9 +18,11 @@
 
 */
 
+
 #ifndef DCPOMATIC_PLAYER_VIDEO_H
 #define DCPOMATIC_PLAYER_VIDEO_H
 
+
 #include "types.h"
 #include "position.h"
 #include "dcpomatic_time.h"
@@ -30,37 +32,41 @@ extern "C" {
 #include <libavutil/pixfmt.h>
 }
 #include <boost/thread/mutex.hpp>
-#include <boost/noncopyable.hpp>
+
 
 class Image;
 class ImageProxy;
 class Film;
 class Socket;
 
+
 /** Everything needed to describe a video frame coming out of the player, but with the
  *  bits still their raw form.  We may want to combine the bits on a remote machine,
  *  or maybe not even bother to combine them at all.
  */
-class PlayerVideo : public boost::noncopyable
+class PlayerVideo
 {
 public:
        PlayerVideo (
-               std::shared_ptr<const ImageProxy>,
-               Crop,
-               boost::optional<double>,
-               dcp::Size,
-               dcp::Size,
-               Eyes,
-               Part,
-               boost::optional<ColourConversion>,
+               std::shared_ptr<const ImageProxy> image,
+               Crop crop,
+               boost::optional<double> fade,
+               dcp::Size inter_size,
+               dcp::Size out_size,
+               Eyes eyes,
+               Part part,
+               boost::optional<ColourConversion> colour_conversion,
                VideoRange video_range,
-               std::weak_ptr<Content>,
-               boost::optional<Frame>,
+               std::weak_ptr<Content> content,
+               boost::optional<Frame> video_frame,
                bool error
                );
 
        PlayerVideo (std::shared_ptr<cxml::Node>, std::shared_ptr<Socket>);
 
+       PlayerVideo (PlayerVideo const&) = delete;
+       PlayerVideo& operator= (PlayerVideo const&) = delete;
+
        std::shared_ptr<PlayerVideo> shallow_copy () const;
 
        void set_text (PositionImage);
@@ -143,4 +149,5 @@ private:
        mutable bool _error;
 };
 
+
 #endif