projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index 189b379bf3beeaa68f43a2d343220e307d891ece..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>);
@@
-54,12
+54,16
@@
private:
void player_changed (bool);
void set_position_text ();
void get (DCPTime, bool);
void player_changed (bool);
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;
wxSizer* _v_sizer;
wxPanel* _panel;
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
wxSizer* _v_sizer;
wxPanel* _panel;
+ wxCheckBox* _outline_content;
wxSlider* _slider;
wxButton* _back_button;
wxButton* _forward_button;
wxSlider* _slider;
wxButton* _back_button;
wxButton* _forward_button;
@@
-70,6
+74,8
@@
private:
boost::shared_ptr<const Image> _frame;
DCPTime _position;
boost::shared_ptr<const Image> _frame;
DCPTime _position;
+ Position<int> _inter_position;
+ dcp::Size _inter_size;
/** Size of our output (including padding if we have any) */
dcp::Size _out_size;
/** Size of our output (including padding if we have any) */
dcp::Size _out_size;
@@
-80,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;
};
};