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 7587911e874c9d1a371879b7fbedd3147fc1ef3b..0a535df9fdda804dd334f9793cc9171fec5d8702 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-28,19
+28,20
@@
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.
*
* The film takes the following path through the viewer:
*
/** @class FilmViewer
* @brief A wx widget to view a preview of a Film.
*
* The film takes the following path through the viewer:
*
- * 1.
fetch_next_frame() asks our _player to decode some data. If it does, process_video()
- *
will be called.
+ * 1. fetch_next_frame() asks our _player to decode some data. If it does, process_video()
+ * will be called.
*
*
- * 2.
process_video() takes the image from the player (_frame).
+ * 2. process_video() takes the image from the player (_frame).
*
*
- * 3.
fetch_next_frame() calls _panel->Refresh() and _panel->Update() which results in
- *
paint_panel() being called; this creates frame_bitmap from _frame and blits it to the display.
+ * 3. fetch_next_frame() calls _panel->Refresh() and _panel->Update() which results in
+ * paint_panel() being called; this creates frame_bitmap from _frame and blits it to the display.
*
* fetch_current_frame_again() asks the player to re-emit its current frame on the next pass(), and then
* starts from step #1.
*
* fetch_current_frame_again() asks the player to re-emit its current frame on the next pass(), and then
* starts from step #1.
@@
-53,20
+54,21
@@
public:
void set_film (boost::shared_ptr<Film>);
private:
void set_film (boost::shared_ptr<Film>);
private:
- void paint_panel (
wxPaintEvent &
);
+ void paint_panel ();
void panel_sized (wxSizeEvent &);
void panel_sized (wxSizeEvent &);
- void slider_moved (
wxScrollEvent &
);
- void play_clicked (
wxCommandEvent &
);
- void timer (
wxTimerEvent &
);
- void process_video (boost::shared_ptr<
const Image>, bool,
Time);
+ void slider_moved ();
+ void play_clicked ();
+ void timer ();
+ void process_video (boost::shared_ptr<
PlayerImage>, Eyes, DCP
Time);
void calculate_sizes ();
void check_play_state ();
void fetch_current_frame_again ();
void fetch_next_frame ();
void active_jobs_changed (bool);
void calculate_sizes ();
void check_play_state ();
void fetch_current_frame_again ();
void fetch_next_frame ();
void active_jobs_changed (bool);
- void back_clicked (wxCommandEvent &);
- void forward_clicked (wxCommandEvent &);
- void player_changed ();
+ void back_clicked ();
+ void forward_clicked ();
+ void player_changed (bool);
+ void set_position_text (DCPTime);
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
@@
-85,7
+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 */
-
lib
dcp::Size _panel_size;
+ dcp::Size _panel_size;
};
};