X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.h;h=a411be5ec5f14a86d040df633262075f7d4cfe58;hb=86765a617035e0283c20c9f2696909743e618156;hp=bec32d814c67214892933f4897ee0fe977def750;hpb=b8693a3bf32380733604aa6e80c9774de575ebe7;p=dcpomatic.git

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index bec32d814..a411be5ec 100644
--- 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.
 
@@ -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,12 +41,14 @@ 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>);
 
+	/** @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);
@@ -50,12 +56,14 @@ public:
 
 	void refresh ();
 
+	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 ();
@@ -66,13 +74,22 @@ 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);
 	DCPTime nudge_amount (wxMouseEvent &);
 	void timecode_clicked ();
+	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;
@@ -82,6 +99,7 @@ private:
 	wxCheckBox* _outline_content;
 	wxRadioButton* _left_eye;
 	wxRadioButton* _right_eye;
+	wxCheckBox* _jump_to_selected;
 	wxSlider* _slider;
 	wxButton* _back_button;
 	wxButton* _forward_button;
@@ -93,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;
 
@@ -101,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;
 };