A little thread safety.

[dcpomatic.git] / src / wx / film_viewer.h

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index beb1a5d749aee4bbeea8ade5b8153eee72465858..eaf46f1e6bbc8474bbc69020e12a0f31e950b828 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -27,6 +27,7 @@
 #include "lib/config.h"
 #include "lib/player_text.h"
 #include "lib/timer.h"
 #include "lib/config.h"
 #include "lib/player_text.h"
 #include "lib/timer.h"

+#include "lib/signaller.h"

 #include <RtAudio.h>
 #include <wx/wx.h>
 
 #include <RtAudio.h>
 #include <wx/wx.h>
 


@@ -42,7 +43,7 @@ class ClosedCaptionsDialog;
 /** @class FilmViewer
  *  @brief A wx widget to view a Film.
  */
 /** @class FilmViewer
  *  @brief A wx widget to view a Film.
  */

-class FilmViewer
+class FilmViewer : public Signaller

 {
 public:
        FilmViewer (wxWindow *);
 {
 public:
        FilmViewer (wxWindow *);


@@ -77,6 +78,7 @@ public:
        bool stop ();
        void suspend ();
        void resume ();
        bool stop ();
        void suspend ();
        void resume ();

+

        bool playing () const {
                return _playing;
        }
        bool playing () const {
                return _playing;
        }


@@ -138,13 +140,13 @@ public:
        boost::shared_ptr<Butler> butler () const {
                return _butler;
        }
        boost::shared_ptr<Butler> butler () const {
                return _butler;
        }

-       int time_until_next_frame () const;

 
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
        boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
        boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
        /** While playing back we reached the end of the film (emitted from GUI thread) */
        boost::signals2::signal<void ()> Finished;
 
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
        boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
        boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
        /** While playing back we reached the end of the film (emitted from GUI thread) */
        boost::signals2::signal<void ()> Finished;

+       void emit_finished ();

 
        boost::signals2::signal<bool ()> PlaybackPermitted;
 
 
        boost::signals2::signal<bool ()> PlaybackPermitted;
 


@@ -165,6 +167,7 @@ private:
        void config_changed (Config::Property);
 
        dcpomatic::DCPTime time () const;
        void config_changed (Config::Property);
 
        dcpomatic::DCPTime time () const;

+       boost::optional<dcpomatic::DCPTime> audio_time () const;

        dcpomatic::DCPTime uncorrected_time () const;
        Frame average_latency () const;
 
        dcpomatic::DCPTime uncorrected_time () const;
        Frame average_latency () const;