Updated fr_FR translation from Thierry Journet.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 0db4bccc55f14cd7e49eb5a9f9485c89810f8d1e..aacede06e5bf64ff43629d8be01fb82951fff273 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -22,14 +22,18 @@
  *  @brief A wx widget to view `thumbnails' of a Film.
  */
 
-#include <wx/wx.h>
 #include "lib/film.h"
+#include "lib/config.h"
+#include <RtAudio.h>
+#include <wx/wx.h>
 
 class wxToggleButton;
 class FFmpegPlayer;
 class Image;
 class RGBPlusAlphaImage;
 class PlayerVideo;
+class Player;
+class Butler;
 
 /** @class FilmViewer
  *  @brief A wx widget to view a preview of a Film.
@@ -38,12 +42,13 @@ class FilmViewer : public wxPanel
 {
 public:
        FilmViewer (wxWindow *);
+       ~FilmViewer ();
 
        void set_film (boost::shared_ptr<Film>);
 
        /** @return our `playhead' position; this may not lie exactly on a frame boundary */
        DCPTime position () const {
-               return _position;
+               return _video_position;
        }
 
        void set_position (DCPTime p);
@@ -51,6 +56,8 @@ public:
 
        void refresh ();
 
+       int audio_callback (void* out, unsigned int frames);
+
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
 
 private:
@@ -67,7 +74,8 @@ private:
        void player_changed (bool);
        void update_position_label ();
        void update_position_slider ();
-       void get (DCPTime, bool);
+       void get ();
+       void seek (DCPTime t, bool accurate);
        void refresh_panel ();
        void setup_sensitivity ();
        void film_changed (Film::Property);
@@ -76,6 +84,12 @@ private:
        void frame_number_clicked ();
        void go_to (DCPTime t);
        void jump_to_selected_clicked ();
+       void recreate_butler ();
+       void config_changed (Config::Property);
+       DCPTime time () const;
+       void start ();
+       bool stop ();
+       Frame average_latency () const;
 
        boost::shared_ptr<Film> _film;
        boost::shared_ptr<Player> _player;
@@ -97,7 +111,7 @@ private:
        bool _pending_player_change;
 
        boost::shared_ptr<const Image> _frame;
-       DCPTime _position;
+       DCPTime _video_position;
        Position<int> _inter_position;
        dcp::Size _inter_size;
 
@@ -105,12 +119,22 @@ private:
        dcp::Size _out_size;
        /** Size of the panel that we have available */
        dcp::Size _panel_size;
-       /** true if the last call to ::get() was specified to be accurate;
+       /** true if the last call to Player::seek() was specified to be accurate;
         *  this is used so that when re-fetching the current frame we
         *  can get the same one that we got last time.
         */
-       bool _last_get_accurate;
+       bool _last_seek_accurate;
+
+       RtAudio _audio;
+       int _audio_channels;
+       unsigned int _audio_block_size;
+       bool _playing;
+       boost::shared_ptr<Butler> _butler;
+
+        std::list<Frame> _latency_history;
+        /** Mutex to protect _latency_history */
+        mutable boost::mutex _latency_history_mutex;
+        int _latency_history_count;
 
-       boost::signals2::scoped_connection _film_connection;
-       boost::signals2::scoped_connection _player_connection;
+       boost::signals2::scoped_connection _config_changed_connection;
 };