projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow specification of DCP to build KDMs for (#235).
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index 0f7b142b50f55630b04dabad29f41550481336c5..7bda9617e9bea0aa92beae1e9d540f0f2f807610 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-28,29
+28,22
@@
class wxToggleButton;
class FFmpegPlayer;
class Image;
class RGBPlusAlphaImage;
class FFmpegPlayer;
class Image;
class RGBPlusAlphaImage;
-class Subtitle;
/** @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.
ge
t_frame() asks our _player to decode some data. If it does, process_video()
- *
will be called.
+ * 1.
fetch_nex
t_frame() asks our _player to decode some data. If it does, process_video()
+ * will be called.
*
*
- * 2. process_video() takes the image and subtitle from the decoder (_raw_frame and _raw_sub)
- * and calls raw_to_display().
- *
- * 3. raw_to_display() copies _raw_frame to _display_frame, processing it and scaling it.
+ * 2. process_video() takes the image from the player (_frame).
*
*
- * 4. calling _panel->Refresh() and _panel->Update() results in paint_panel() being called;
- * this creates frame_bitmap from _display_frame and blits it to the display. It also
- * blits the subtitle, if required.
+ * 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.
*
*
- *
update_from_decoder
() asks the player to re-emit its current frame on the next pass(), and then
+ *
fetch_current_frame_again
() asks the player to re-emit its current frame on the next pass(), and then
* starts from step #1.
* starts from step #1.
- *
- * update_from_raw() starts at step #3, then calls _panel->Refresh and _panel->Update.
*/
class FilmViewer : public wxPanel
{
*/
class FilmViewer : public wxPanel
{
@@
-60,20
+53,21
@@
public:
void set_film (boost::shared_ptr<Film>);
private:
void set_film (boost::shared_ptr<Film>);
private:
- void film_changed (Film::Property);
- 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<
Image>, bool, boost::shared_ptr<Subtitle>
);
+ void slider_moved ();
+ void play_clicked ();
+ void timer ();
+ void process_video (boost::shared_ptr<
const Image>, Eyes, Time
);
void calculate_sizes ();
void check_play_state ();
void calculate_sizes ();
void check_play_state ();
- void update_from_raw ();
- void update_from_decoder ();
- void raw_to_display ();
- void get_frame ();
+ void fetch_current_frame_again ();
+ void fetch_next_frame ();
void active_jobs_changed (bool);
void active_jobs_changed (bool);
+ void back_clicked ();
+ void forward_clicked ();
+ void player_changed (bool);
+ void set_position_text (Time);
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
@@
-81,21
+75,20
@@
private:
wxSizer* _v_sizer;
wxPanel* _panel;
wxSlider* _slider;
wxSizer* _v_sizer;
wxPanel* _panel;
wxSlider* _slider;
+ wxButton* _back_button;
+ wxButton* _forward_button;
+ wxStaticText* _frame_number;
+ wxStaticText* _timecode;
wxToggleButton* _play_button;
wxTimer _timer;
wxToggleButton* _play_button;
wxTimer _timer;
- boost::shared_ptr<Image> _raw_frame;
- boost::shared_ptr<Subtitle> _raw_sub;
- boost::shared_ptr<Image> _display_frame;
- int _display_frame_x;
- boost::shared_ptr<RGBPlusAlphaImage> _display_sub;
- Position _display_sub_position;
+ boost::shared_ptr<const Image> _frame;
bool _got_frame;
/** Size of our output (including padding if we have any) */
libdcp::Size _out_size;
bool _got_frame;
/** Size of our output (including padding if we have any) */
libdcp::Size _out_size;
- /** Size that we will make our film (equal to _out_size unless we have padding) */
- libdcp::Size _film_size;
/** Size of the panel that we have available */
libdcp::Size _panel_size;
/** Size of the panel that we have available */
libdcp::Size _panel_size;
+
+ std::list<std::pair<boost::shared_ptr<const Image>, Time> > _queue;
};
};