projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change video content scaling so that it either:
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index e98fbe176b84a2bbd086536d74c539b3d743fb25..29985a5816bb701b44ec3e0a5c0e92672b8a4d8c 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-27,6
+27,7
@@
#include "lib/config.h"
#include "lib/player_text.h"
#include "lib/timer.h"
#include "lib/config.h"
#include "lib/player_text.h"
#include "lib/timer.h"
+#include "lib/signaller.h"
#include <RtAudio.h>
#include <wx/wx.h>
#include <RtAudio.h>
#include <wx/wx.h>
@@
-42,7
+43,7
@@
class ClosedCaptionsDialog;
/** @class FilmViewer
* @brief A wx widget to view a Film.
*/
/** @class FilmViewer
* @brief A wx widget to view a Film.
*/
-class FilmViewer
+class FilmViewer
: public Signaller
{
public:
FilmViewer (wxWindow *);
{
public:
FilmViewer (wxWindow *);
@@
-69,7
+70,7
@@
public:
void seek_by (dcpomatic::DCPTime by, bool accurate);
/** @return our `playhead' position; this may not lie exactly on a frame boundary */
dcpomatic::DCPTime position () const {
void seek_by (dcpomatic::DCPTime by, bool accurate);
/** @return our `playhead' position; this may not lie exactly on a frame boundary */
dcpomatic::DCPTime position () const {
- return _video_
position
;
+ return _video_
view->position()
;
}
dcpomatic::DCPTime one_video_frame () const;
}
dcpomatic::DCPTime one_video_frame () const;
@@
-77,6
+78,7
@@
public:
bool stop ();
void suspend ();
void resume ();
bool stop ();
void suspend ();
void resume ();
+
bool playing () const {
return _playing;
}
bool playing () const {
return _playing;
}
@@
-85,21
+87,25
@@
public:
void set_dcp_decode_reduction (boost::optional<int> reduction);
boost::optional<int> dcp_decode_reduction () const;
void set_outline_content (bool o);
void set_dcp_decode_reduction (boost::optional<int> reduction);
boost::optional<int> dcp_decode_reduction () const;
void set_outline_content (bool o);
+ void set_outline_subtitles (boost::optional<dcpomatic::Rect<double> >);
void set_eyes (Eyes e);
void set_pad_black (bool p);
void slow_refresh ();
void set_eyes (Eyes e);
void set_pad_black (bool p);
void slow_refresh ();
- int dropped () const {
- return _dropped;
- }
+ dcpomatic::DCPTime time () const;
+ boost::optional<dcpomatic::DCPTime> audio_time () const;
+
+ int dropped () const;
+ int errored () const;
+ int gets () const;
int audio_callback (void* out, unsigned int frames);
#ifdef DCPOMATIC_VARIANT_SWAROOP
void set_background_image (bool b) {
_background_image = b;
int audio_callback (void* out, unsigned int frames);
#ifdef DCPOMATIC_VARIANT_SWAROOP
void set_background_image (bool b) {
_background_image = b;
-
refresh_view
();
+
_video_view->update
();
}
bool background_image () const {
}
bool background_image () const {
@@
-108,36
+114,35
@@
public:
#endif
StateTimer const & state_timer () const {
#endif
StateTimer const & state_timer () const {
- return _state_timer;
- }
-
- StateTimer& state_timer () {
- return _state_timer;
- }
-
- int gets () const {
- return _gets;
+ return _video_view->state_timer ();
}
}
- /* Some accessors that VideoView classes need */
+ /* Some accessors
and utility methods
that VideoView classes need */
dcp::Size out_size () const {
return _out_size;
}
dcp::Size out_size () const {
return _out_size;
}
- dcp::Size inter_size () const {
- return _inter_size;
- }
- Position<int> inter_position () const {
- return _inter_position;
- }
bool outline_content () const {
return _outline_content;
}
bool outline_content () const {
return _outline_content;
}
+ boost::optional<dcpomatic::Rect<double> > outline_subtitles () const {
+ return _outline_subtitles;
+ }
bool pad_black () const {
return _pad_black;
}
bool pad_black () const {
return _pad_black;
}
+ boost::shared_ptr<Butler> butler () const {
+ return _butler;
+ }
+ ClosedCaptionsDialog* closed_captions_dialog () const {
+ return _closed_captions_dialog;
+ }
+ void finished ();
+
+ bool pending_idle_get () const {
+ return _idle_get;
+ }
boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
- boost::signals2::signal<void ()> PositionChanged;
boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
/** While playing back we reached the end of the film (emitted from GUI thread) */
boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
/** While playing back we reached the end of the film (emitted from GUI thread) */
@@
-147,23
+152,20
@@
public:
private:
private:
- /* XXX_b: to remove */
- friend class SimpleVideoView;
-
void video_view_sized ();
void calculate_sizes ();
void player_change (ChangeType type, int, bool);
void idle_handler ();
void video_view_sized ();
void calculate_sizes ();
void player_change (ChangeType type, int, bool);
void idle_handler ();
- void request_idle_
get
();
+ void request_idle_
display_next_frame
();
void film_change (ChangeType, Film::Property);
void recreate_butler ();
void config_changed (Config::Property);
void film_change (ChangeType, Film::Property);
void recreate_butler ();
void config_changed (Config::Property);
+ void film_length_change ();
+ void ui_finished ();
- dcpomatic::DCPTime time () const;
dcpomatic::DCPTime uncorrected_time () const;
Frame average_latency () const;
dcpomatic::DCPTime uncorrected_time () const;
Frame average_latency () const;
- void refresh_view ();
bool quick_refresh ();
boost::shared_ptr<Film> _film;
bool quick_refresh ();
boost::shared_ptr<Film> _film;
@@
-173,10
+175,6
@@
private:
bool _coalesce_player_changes;
std::list<int> _pending_player_changes;
bool _coalesce_player_changes;
std::list<int> _pending_player_changes;
- dcpomatic::DCPTime _video_position;
- Position<int> _inter_position;
- dcp::Size _inter_size;
-
/** Size of our output (including padding if we have any) */
dcp::Size _out_size;
/** Size of our output (including padding if we have any) */
dcp::Size _out_size;
@@
-192,13
+190,12
@@
private:
mutable boost::mutex _latency_history_mutex;
int _latency_history_count;
mutable boost::mutex _latency_history_mutex;
int _latency_history_count;
- int _dropped;
boost::optional<int> _dcp_decode_reduction;
ClosedCaptionsDialog* _closed_captions_dialog;
bool _outline_content;
boost::optional<int> _dcp_decode_reduction;
ClosedCaptionsDialog* _closed_captions_dialog;
bool _outline_content;
-
Eyes _ey
es;
+
boost::optional<dcpomatic::Rect<double> > _outline_subtitl
es;
/** true to pad the viewer panel with black, false to use
the normal window background colour.
*/
/** true to pad the viewer panel with black, false to use
the normal window background colour.
*/
@@
-208,9
+205,6
@@
private:
bool _background_image;
#endif
bool _background_image;
#endif
- StateTimer _state_timer;
- int _gets;
-
/** true if an get() is required next time we are idle */
bool _idle_get;
/** true if an get() is required next time we are idle */
bool _idle_get;