class FFmpegPlayer;
class Image;
class RGBPlusAlphaImage;
-class Subtitle;
/** @class FilmViewer
* @brief A wx widget to view a preview of a Film.
* 1. get_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().
+ * 2. process_video() takes the image from the decoder (_raw_frame) and calls raw_to_display().
*
* 3. raw_to_display() copies _raw_frame to _display_frame, processing it and scaling it.
*
* 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.
+ * this creates frame_bitmap from _display_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
* starts from step #1.
private:
void film_changed (Film::Property);
- void film_content_changed (int);
+ void film_content_changed (boost::weak_ptr<Content>, int);
void paint_panel (wxPaintEvent &);
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 process_video (boost::shared_ptr<const Image>, bool, Time);
void calculate_sizes ();
void check_play_state ();
void update_from_raw ();
void raw_to_display ();
void get_frame ();
void active_jobs_changed (bool);
- void setup_player ();
+ void back_clicked (wxCommandEvent &);
+ void forward_clicked (wxCommandEvent &);
boost::shared_ptr<Film> _film;
boost::shared_ptr<Player> _player;
wxSizer* _v_sizer;
wxPanel* _panel;
wxSlider* _slider;
+ wxButton* _back_button;
+ wxButton* _forward_button;
+ wxStaticText* _frame;
+ wxStaticText* _timecode;
wxToggleButton* _play_button;
wxTimer _timer;
- boost::shared_ptr<Image> _raw_frame;
- boost::shared_ptr<Subtitle> _raw_sub;
- boost::shared_ptr<Image> _display_frame;
+ boost::shared_ptr<const Image> _raw_frame;
+ boost::shared_ptr<const Image> _display_frame;
+ /* The x offset at which we display the actual film content; this corresponds
+ to the film's padding converted to our coordinates.
+ */
int _display_frame_x;
- boost::shared_ptr<RGBPlusAlphaImage> _display_sub;
- Position _display_sub_position;
bool _got_frame;
/** Size of our output (including padding if we have any) */
libdcp::Size _film_size;
/** Size of the panel that we have available */
libdcp::Size _panel_size;
-
- bool _clear_required;
};