projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
195eb82
)
film() isn't a FilmViewer proxy.
author
Carl Hetherington
<cth@carlh.net>
Mon, 10 Sep 2018 23:19:35 +0000
(
00:19
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 11 Sep 2018 10:58:15 +0000
(11:58 +0100)
src/wx/control_film_viewer.h
patch
|
blob
|
history
diff --git
a/src/wx/control_film_viewer.h
b/src/wx/control_film_viewer.h
index cef5cb552b8a6d3db1c4fc9e51d897225d79e732..9200cad32721587927129f5b28570eff5512be73 100644
(file)
--- a/
src/wx/control_film_viewer.h
+++ b/
src/wx/control_film_viewer.h
@@
-18,6
+18,7
@@
public:
ControlFilmViewer (wxWindow* parent, bool outline_content = true, bool jump_to_selected = true);
void set_film (boost::shared_ptr<Film> film);
+ boost::shared_ptr<Film> film () const;
void back_frame ();
void forward_frame ();
@@
-31,7
+32,6
@@
public:
bool playing () const;
void slow_refresh ();
int dropped () const;
- boost::shared_ptr<Film> film () const;
boost::optional<int> dcp_decode_reduction () const;
DCPTime position () const;
void set_coalesce_player_changes (bool c);