class Player;
class PlayerVideo;
-class Log;
class Butler : public ExceptionStore, public boost::noncopyable
{
public:
- Butler (boost::shared_ptr<Player> player, boost::shared_ptr<Log> log, AudioMapping map, int audio_channels);
+ Butler (
+ boost::shared_ptr<Player> player,
+ AudioMapping map,
+ int audio_channels,
+ boost::function<AVPixelFormat (AVPixelFormat)> pixel_format,
+ bool aligned,
+ bool fast
+ );
+
~Butler ();
void seek (DCPTime position, bool accurate);
enum Error {
NONE,
- AGAIN
+ AGAIN,
+ DIED
};
std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get_video (Error* e = 0);
private:
void thread ();
void video (boost::shared_ptr<PlayerVideo> video, DCPTime time);
- void audio (boost::shared_ptr<AudioBuffers> audio, DCPTime time);
+ void audio (boost::shared_ptr<AudioBuffers> audio, DCPTime time, int frame_rate);
void text (PlayerText pt, TextType type, boost::optional<DCPTextTrack> track, DCPTimePeriod period);
bool should_run () const;
- void prepare (boost::weak_ptr<PlayerVideo> video) const;
+ void prepare (boost::weak_ptr<PlayerVideo> video);
void player_change (ChangeType type, bool frequent);
void seek_unlocked (DCPTime position, bool accurate);
boost::shared_ptr<Player> _player;
- boost::shared_ptr<Log> _log;
boost::thread* _thread;
/** mutex to protect _video, _audio and _closed_caption for when we are clearing them and they all need to be
bool _disable_audio;
+ boost::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
+ bool _aligned;
+ bool _fast;
+
/** If we are waiting to be refilled following a seek, this is the time we were
seeking to.
*/