Remove check on whether the last seek was accurate when re-getting

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 563178ac341f4f2b0d8d44b2e7a1d6757ccb3115..0c71ae1bd387c1e599989ab154e53003d88b75ac 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.
@@ -37,37 +41,49 @@ class PlayerVideo;
 class FilmViewer : public wxPanel
 {
 public:
-       FilmViewer (wxWindow *);
+       FilmViewer (wxWindow *, bool outline_content = true, bool jump_to_selected = true);
+       ~FilmViewer ();
 
        void set_film (boost::shared_ptr<Film>);
+       boost::shared_ptr<Film> film () const {
+               return _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);
        void set_coalesce_player_changes (bool c);
+       void set_dcp_decode_reduction (boost::optional<int> reduction);
+       boost::optional<int> dcp_decode_reduction () const;
 
        void refresh ();
 
+       int dropped () const {
+               return _dropped;
+       }
+
+       int audio_callback (void* out, unsigned int frames);
+
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
 
 private:
        void paint_panel ();
        void panel_sized (wxSizeEvent &);
-       void slider_moved ();
+       void slider_moved (bool update_slider);
        void play_clicked ();
        void timer ();
        void calculate_sizes ();
        void check_play_state ();
        void active_jobs_changed (boost::optional<std::string>);
+       void rewind_clicked (wxMouseEvent &);
        void back_clicked (wxMouseEvent &);
        void forward_clicked (wxMouseEvent &);
        void player_changed (bool);
        void update_position_label ();
        void update_position_slider ();
-       void video (boost::shared_ptr<PlayerVideo>);
        void get ();
        void seek (DCPTime t, bool accurate);
        void refresh_panel ();
@@ -78,17 +94,26 @@ 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;
+       DCPTime one_video_frame () const;
 
        boost::shared_ptr<Film> _film;
        boost::shared_ptr<Player> _player;
 
        wxSizer* _v_sizer;
+       /** The area that we put our image in */
        wxPanel* _panel;
        wxCheckBox* _outline_content;
        wxRadioButton* _left_eye;
        wxRadioButton* _right_eye;
        wxCheckBox* _jump_to_selected;
        wxSlider* _slider;
+       wxButton* _rewind_button;
        wxButton* _back_button;
        wxButton* _forward_button;
        wxStaticText* _frame_number;
@@ -99,7 +124,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;
 
@@ -107,11 +132,20 @@ private:
        dcp::Size _out_size;
        /** Size of the panel that we have available */
        dcp::Size _panel_size;
-       /** 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_seek_accurate;
-       boost::signals2::scoped_connection _film_connection;
-       boost::signals2::scoped_connection _player_connection;
+
+       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;
+
+       int _dropped;
+       boost::optional<int> _dcp_decode_reduction;
+
+       boost::signals2::scoped_connection _config_changed_connection;
 };