diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-02-04 00:24:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-02-04 00:24:55 +0100 |
| commit | 42cdfe79afa72a428b5ee851611079f84d237f63 (patch) | |
| tree | 5924126c4a849574a8be6b423051eda3120491ea /src/lib/player_video.h | |
| parent | 81e16caf6414a011bbbe6e8c788f9dc1e4c0ce52 (diff) | |
Some noncopyable removal.
Diffstat (limited to 'src/lib/player_video.h')
| -rw-r--r-- | src/lib/player_video.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/lib/player_video.h b/src/lib/player_video.h index 569789c8c..df0007ddf 100644 --- 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,18 +32,19 @@ 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 ( @@ -61,6 +64,9 @@ public: 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 |