Attempt to tidy up internal APIs slightly.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index c9f25fa65dab2f67a397491fdf6072897376f955..d01e002906be3522bad6ee72595987d55ee3b7fc 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -41,6 +41,7 @@ public:
 
        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;
        }
@@ -66,11 +67,17 @@ private:
        void player_changed (bool);
        void update_position_label ();
        void update_position_slider ();
-       void get (DCPTime, bool);
+       void video (boost::shared_ptr<PlayerVideo>, DCPTime time);
+       void get ();
+       void seek (DCPTime t, bool accurate);
        void refresh_panel ();
        void setup_sensitivity ();
        void film_changed (Film::Property);
        DCPTime nudge_amount (wxMouseEvent &);
+       void timecode_clicked ();
+       void frame_number_clicked ();
+       void go_to (DCPTime t);
+       void jump_to_selected_clicked ();
 
        boost::shared_ptr<Film> _film;
        boost::shared_ptr<Player> _player;
@@ -80,6 +87,7 @@ private:
        wxCheckBox* _outline_content;
        wxRadioButton* _left_eye;
        wxRadioButton* _right_eye;
+       wxCheckBox* _jump_to_selected;
        wxSlider* _slider;
        wxButton* _back_button;
        wxButton* _forward_button;
@@ -99,12 +107,9 @@ 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;
-
-       boost::signals2::scoped_connection _film_connection;
-       boost::signals2::scoped_connection _player_connection;
+       bool _last_seek_accurate;
 };