projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stub player.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index ed7795dad3f1a96233a449412caca2d609aea09f..a411be5ec5f14a86d040df633262075f7d4cfe58 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-41,7
+41,7
@@
class Butler;
class FilmViewer : public wxPanel
{
public:
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>);
~FilmViewer ();
void set_film (boost::shared_ptr<Film>);
@@
-63,7
+63,7
@@
public:
private:
void paint_panel ();
void panel_sized (wxSizeEvent &);
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 play_clicked ();
void timer ();
void calculate_sizes ();
@@
-89,6
+89,7
@@
private:
DCPTime time () const;
void start ();
bool stop ();
DCPTime time () const;
void start ();
bool stop ();
+ Frame average_latency () const;
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
@@
-130,5
+131,10
@@
private:
bool _playing;
boost::shared_ptr<Butler> _butler;
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 _config_changed_connection;
};
boost::signals2::scoped_connection _config_changed_connection;
};