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 7bda9617e9bea0aa92beae1e9d540f0f2f807610..0a535df9fdda804dd334f9793cc9171fec5d8702 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-28,6
+28,7
@@
class wxToggleButton;
class FFmpegPlayer;
class Image;
class RGBPlusAlphaImage;
class FFmpegPlayer;
class Image;
class RGBPlusAlphaImage;
+class PlayerImage;
/** @class FilmViewer
* @brief A wx widget to view a preview of a Film.
/** @class FilmViewer
* @brief A wx widget to view a preview of a Film.
@@
-58,7
+59,7
@@
private:
void slider_moved ();
void play_clicked ();
void timer ();
void slider_moved ();
void play_clicked ();
void timer ();
- void process_video (boost::shared_ptr<
const Image>, Eyes,
Time);
+ void process_video (boost::shared_ptr<
PlayerImage>, Eyes, DCP
Time);
void calculate_sizes ();
void check_play_state ();
void fetch_current_frame_again ();
void calculate_sizes ();
void check_play_state ();
void fetch_current_frame_again ();
@@
-67,7
+68,7
@@
private:
void back_clicked ();
void forward_clicked ();
void player_changed (bool);
void back_clicked ();
void forward_clicked ();
void player_changed (bool);
- void set_position_text (Time);
+ void set_position_text (
DCP
Time);
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
@@
-86,9
+87,7
@@
private:
bool _got_frame;
/** Size of our output (including padding if we have any) */
bool _got_frame;
/** Size of our output (including padding if we have any) */
-
lib
dcp::Size _out_size;
+ dcp::Size _out_size;
/** Size of the panel that we have available */
/** Size of the panel that we have available */
- libdcp::Size _panel_size;
-
- std::list<std::pair<boost::shared_ptr<const Image>, Time> > _queue;
+ dcp::Size _panel_size;
};
};