projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure we use limited ("video") range data when exporting.
[dcpomatic.git]
/
src
/
lib
/
butler.h
diff --git
a/src/lib/butler.h
b/src/lib/butler.h
index ce3c9ae4859be430633ba6b629edafe94bde79e3..6b933be4b85a4e98814297e4d4cf6bcdbd9ec14a 100644
(file)
--- a/
src/lib/butler.h
+++ b/
src/lib/butler.h
@@
-41,6
+41,7
@@
public:
AudioMapping map,
int audio_channels,
boost::function<AVPixelFormat (AVPixelFormat)> pixel_format,
AudioMapping map,
int audio_channels,
boost::function<AVPixelFormat (AVPixelFormat)> pixel_format,
+ VideoRange video_range,
bool aligned,
bool fast
);
bool aligned,
bool fast
);
@@
-49,9
+50,23
@@
public:
void seek (dcpomatic::DCPTime position, bool accurate);
void seek (dcpomatic::DCPTime position, bool accurate);
- enum Error {
- NONE,
- AGAIN
+ 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<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get_video (bool blocking, Error* e = 0);
@@
-92,6
+107,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;
@@
-100,6
+116,7
@@
private:
bool _disable_audio;
boost::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
bool _disable_audio;
boost::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
+ VideoRange _video_range;
bool _aligned;
bool _fast;
bool _aligned;
bool _fast;