Config option to disable preview audio.

[dcpomatic.git] / src / lib / butler.h

diff --git a/src/lib/butler.h b/src/lib/butler.h
index d6742dcfa02fdb7f04625423506f9125dd0a643d..948a78ea5f64d79dfa82c9ddc864f48b56556927 100644 (file)
--- 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);
@@ -41,11 +42,14 @@ public:
        std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get_video ();
        void get_audio (float* out, Frame frames);
 
+       void disable_audio ();
+
 private:
        void thread ();
        void video (boost::shared_ptr<PlayerVideo> video, DCPTime time);
        void audio (boost::shared_ptr<AudioBuffers> audio, DCPTime time);
        void player_changed ();
+       bool should_run () const;
 
        boost::weak_ptr<const Film> _film;
        boost::shared_ptr<Player> _player;
@@ -65,6 +69,9 @@ private:
        AudioMapping _audio_mapping;
        int _audio_channels;
 
+       bool _stop_thread;
+       bool _disable_audio;
+
        boost::signals2::scoped_connection _player_video_connection;
        boost::signals2::scoped_connection _player_audio_connection;
        boost::signals2::scoped_connection _player_changed_connection;