projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index 930937596ab9afa64fb340463c07c6c0298e851e..e502c6f45cd2922e3d9fe90c32fe7553c67d83a6 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-36,7
+36,7
@@
class PlayerVideo;
class FilmViewer : public wxPanel
{
public:
class FilmViewer : public wxPanel
{
public:
- FilmViewer (
boost::shared_ptr<Film>,
wxWindow *);
+ FilmViewer (wxWindow *);
void set_film (boost::shared_ptr<Film>);
void set_film (boost::shared_ptr<Film>);
@@
-55,6
+55,8
@@
private:
void set_position_text ();
void get (DCPTime, bool);
void refresh_panel ();
void set_position_text ();
void get (DCPTime, bool);
void refresh_panel ();
+ void setup_sensitivity ();
+ void film_changed (Film::Property);
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
@@
-84,4
+86,7
@@
private:
* can get the same one that we got last time.
*/
bool _last_get_accurate;
* 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;
};
};