projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
src
/
lib
/
butler.h
diff --git
a/src/lib/butler.h
b/src/lib/butler.h
index 6263d61431d6e9fff81d7886d5e134d3a1a00c18..a231fd0990bf75f8f4e0f8f5bfe4eab50f9bff26 100644
(file)
--- a/
src/lib/butler.h
+++ b/
src/lib/butler.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2016-20
17
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,45
+18,64
@@
*/
*/
-#include "video_ring_buffers.h"
-#include "audio_ring_buffers.h"
-#include "text_ring_buffers.h"
+
#include "audio_mapping.h"
#include "audio_mapping.h"
+#include "audio_ring_buffers.h"
+#include "change_signaller.h"
#include "exception_store.h"
#include "exception_store.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include "text_ring_buffers.h"
+#include "video_ring_buffers.h"
+#include <boost/asio.hpp>
+#include <boost/signals2.hpp>
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
-#include <boost/signals2.hpp>
-#include <boost/asio.hpp>
+
class Player;
class PlayerVideo;
class Player;
class PlayerVideo;
-class Butler : public ExceptionStore, public boost::noncopyable
+
+class Butler : public ExceptionStore
{
public:
Butler (
{
public:
Butler (
- boost::shared_ptr<Player> player,
+ std::weak_ptr<const Film> film,
+ std::shared_ptr<Player> player,
AudioMapping map,
int audio_channels,
AudioMapping map,
int audio_channels,
- boost::function<AVPixelFormat (AVPixelFormat)> pixel_format,
+ std::function<AVPixelFormat (AVPixelFormat)> pixel_format,
+ VideoRange video_range,
bool aligned,
bool fast
);
~Butler ();
bool aligned,
bool fast
);
~Butler ();
+ Butler (Butler const&) = delete;
+ Butler& operator= (Butler const&) = delete;
+
void seek (dcpomatic::DCPTime position, bool accurate);
void seek (dcpomatic::DCPTime position, bool accurate);
- enum Error {
- NONE,
- AGAIN,
- DIED,
- FINISHED
+ class Error {
+ public:
+ enum Code{
+ NONE,
+ AGAIN,
+ DIED,
+ FINISHED
+ };
+
+ Error()
+ : code (NONE)
+ {}
+
+ Code code;
+ std::string message;
+
+ std::string summary () const;
};
};
- std::pair<
boost
::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get_video (bool blocking, Error* e = 0);
+ std::pair<
std
::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get_video (bool blocking, Error* e = 0);
boost::optional<dcpomatic::DCPTime> get_audio (float* out, Frame frames);
boost::optional<TextRingBuffers::Data> get_closed_caption ();
boost::optional<dcpomatic::DCPTime> get_audio (float* out, Frame frames);
boost::optional<TextRingBuffers::Data> get_closed_caption ();
@@
-66,15
+85,16
@@
public:
private:
void thread ();
private:
void thread ();
- void video (
boost
::shared_ptr<PlayerVideo> video, dcpomatic::DCPTime time);
- void audio (
boost
::shared_ptr<AudioBuffers> audio, dcpomatic::DCPTime time, int frame_rate);
+ void video (
std
::shared_ptr<PlayerVideo> video, dcpomatic::DCPTime time);
+ void audio (
std
::shared_ptr<AudioBuffers> audio, dcpomatic::DCPTime time, int frame_rate);
void text (PlayerText pt, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
bool should_run () const;
void text (PlayerText pt, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
bool should_run () const;
- void prepare (
boost
::weak_ptr<PlayerVideo> video);
- void player_change (ChangeType type);
+ void prepare (
std
::weak_ptr<PlayerVideo> video);
+ void player_change (ChangeType type
, int property
);
void seek_unlocked (dcpomatic::DCPTime position, bool accurate);
void seek_unlocked (dcpomatic::DCPTime position, bool accurate);
- boost::shared_ptr<Player> _player;
+ std::weak_ptr<const Film> _film;
+ std::shared_ptr<Player> _player;
boost::thread _thread;
VideoRingBuffers _video;
boost::thread _thread;
VideoRingBuffers _video;
@@
-83,7
+103,7
@@
private:
boost::thread_group _prepare_pool;
boost::asio::io_service _prepare_service;
boost::thread_group _prepare_pool;
boost::asio::io_service _prepare_service;
-
boost
::shared_ptr<boost::asio::io_service::work> _prepare_work;
+
std
::shared_ptr<boost::asio::io_service::work> _prepare_work;
/** mutex to protect _pending_seek_position, _pending_seek_accurate, _finished, _died, _stop_thread */
boost::mutex _mutex;
/** mutex to protect _pending_seek_position, _pending_seek_accurate, _finished, _died, _stop_thread */
boost::mutex _mutex;
@@
-94,6
+114,7
@@
private:
int _suspended;
bool _finished;
bool _died;
int _suspended;
bool _finished;
bool _died;
+ std::string _died_message;
bool _stop_thread;
AudioMapping _audio_mapping;
bool _stop_thread;
AudioMapping _audio_mapping;
@@
-101,7
+122,8
@@
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;
bool _aligned;
bool _fast;