diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-04-18 00:07:07 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-19 23:04:32 +0100 |
| commit | 361352316a011e648838588ad07bf69ba5edf344 (patch) | |
| tree | a44b8f5b1eee1a4eefc59df88c94b88b5d7ae0e3 /src/lib/butler.h | |
| parent | b18c12353d22037d85086c150ff9b3d3a2546f4d (diff) | |
Handle butler thread exceptions properly.
Diffstat (limited to 'src/lib/butler.h')
| -rw-r--r-- | src/lib/butler.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/butler.h b/src/lib/butler.h index f48352448..101677558 100644 --- a/src/lib/butler.h +++ b/src/lib/butler.h @@ -21,6 +21,7 @@ #include "video_ring_buffers.h" #include "audio_ring_buffers.h" #include "audio_mapping.h" +#include "exception_store.h" #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> #include <boost/thread.hpp> @@ -31,7 +32,7 @@ class Film; class Player; class PlayerVideo; -class Butler : public boost::noncopyable +class Butler : public ExceptionStore, public boost::noncopyable { public: Butler (boost::weak_ptr<const Film> film, boost::shared_ptr<Player> player, AudioMapping map, int audio_channels); |