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 dbaf8eee268167d558dd9d05c9ee402b1fdce09b..950758f61c9f401cd63e28a4473f013e8ab18785 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-23,13
+23,12
@@
#include <wx/wx.h>
#include "lib/film.h"
#include <wx/wx.h>
#include "lib/film.h"
-#include "lib/decoder_factory.h"
class wxToggleButton;
class FFmpegPlayer;
class Image;
class RGBPlusAlphaImage;
class wxToggleButton;
class FFmpegPlayer;
class Image;
class RGBPlusAlphaImage;
-class
Subtitl
e;
+class
PlayerVideoFram
e;
/** @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.
@@
-42,37
+41,38
@@
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>, boost::shared_ptr<Subtitle>);
+ void slider_moved ();
+ void play_clicked ();
+ void timer ();
void calculate_sizes ();
void check_play_state ();
void calculate_sizes ();
void check_play_state ();
- void update_from_raw ();
- void decoder_changed ();
- void raw_to_display ();
- void get_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 ();
+ void get (DCPTime, bool);
boost::shared_ptr<Film> _film;
boost::shared_ptr<Film> _film;
-
+ boost::shared_ptr<Player> _player;
+
+ wxSizer* _v_sizer;
wxPanel* _panel;
wxSlider* _slider;
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;
- Decoders _decoders;
- boost::shared_ptr<Image> _raw_frame;
- boost::shared_ptr<Subtitle> _raw_sub;
- boost::shared_ptr<Image> _display_frame;
- boost::shared_ptr<RGBPlusAlphaImage> _display_sub;
- Position _display_sub_position;
+ boost::shared_ptr<const Image> _frame;
+ DCPTime _position;
- int _out_width;
-
int _out_height
;
- int _panel_width;
-
int _panel_height
;
+ /** Size of our output (including padding if we have any) */
+
dcp::Size _out_size
;
+ /** Size of the panel that we have available */
+
dcp::Size _panel_size
;
};
};