projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assorted tidying.
[dcpomatic.git]
/
src
/
lib
/
butler.h
diff --git
a/src/lib/butler.h
b/src/lib/butler.h
index 8c7f554cb800f4ef94a4a40278463748616cc8f8..a231fd0990bf75f8f4e0f8f5bfe4eab50f9bff26 100644
(file)
--- a/
src/lib/butler.h
+++ b/
src/lib/butler.h
@@
-18,6
+18,7
@@
*/
*/
+
#include "audio_mapping.h"
#include "audio_ring_buffers.h"
#include "change_signaller.h"
#include "audio_mapping.h"
#include "audio_ring_buffers.h"
#include "change_signaller.h"
@@
-29,10
+30,12
@@
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
+
class Player;
class PlayerVideo;
class Player;
class PlayerVideo;
-class Butler : public ExceptionStore, public boost::noncopyable
+
+class Butler : public ExceptionStore
{
public:
Butler (
{
public:
Butler (
@@
-40,7
+43,7
@@
public:
std::shared_ptr<Player> player,
AudioMapping map,
int audio_channels,
std::shared_ptr<Player> player,
AudioMapping map,
int audio_channels,
-
boost
::function<AVPixelFormat (AVPixelFormat)> pixel_format,
+
std
::function<AVPixelFormat (AVPixelFormat)> pixel_format,
VideoRange video_range,
bool aligned,
bool fast
VideoRange video_range,
bool aligned,
bool fast
@@
-48,6
+51,9
@@
public:
~Butler ();
~Butler ();
+ Butler (Butler const&) = delete;
+ Butler& operator= (Butler const&) = delete;
+
void seek (dcpomatic::DCPTime position, bool accurate);
class Error {
void seek (dcpomatic::DCPTime position, bool accurate);
class Error {
@@
-116,7
+122,7
@@
private:
bool _disable_audio;
bool _disable_audio;
-
boost
::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
+
std
::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
VideoRange _video_range;
bool _aligned;
bool _fast;
VideoRange _video_range;
bool _aligned;
bool _fast;