projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move some updates from content_change to player_change.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index 60cde60d00139b10fb6a6546995e1eca66b50196..125e4fd2d958787585be3ffe667e91063a1fa0a9 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
19
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,18
+18,25
@@
*/
*/
+
/** @file src/film_viewer.h
* @brief FilmViewer class.
*/
/** @file src/film_viewer.h
* @brief FilmViewer class.
*/
+
#include "video_view.h"
#include "lib/film.h"
#include "lib/config.h"
#include "lib/player_text.h"
#include "lib/timer.h"
#include "lib/signaller.h"
#include "video_view.h"
#include "lib/film.h"
#include "lib/config.h"
#include "lib/player_text.h"
#include "lib/timer.h"
#include "lib/signaller.h"
+#include "lib/warnings.h"
#include <RtAudio.h>
#include <RtAudio.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
+#include <vector>
+
class wxToggleButton;
class FFmpegPlayer;
class wxToggleButton;
class FFmpegPlayer;
@@
-40,6
+47,7
@@
class Player;
class Butler;
class ClosedCaptionsDialog;
class Butler;
class ClosedCaptionsDialog;
+
/** @class FilmViewer
* @brief A wx widget to view a Film.
*/
/** @class FilmViewer
* @brief A wx widget to view a Film.
*/
@@
-60,13
+68,13
@@
public:
void show_closed_captions ();
void show_closed_captions ();
- void set_film (
boost
::shared_ptr<Film>);
-
boost
::shared_ptr<Film> film () const {
+ void set_film (
std
::shared_ptr<Film>);
+
std
::shared_ptr<Film> film () const {
return _film;
}
void seek (dcpomatic::DCPTime t, bool accurate);
return _film;
}
void seek (dcpomatic::DCPTime t, bool accurate);
- void seek (
boost
::shared_ptr<Content> content, dcpomatic::ContentTime p, bool accurate);
+ void seek (
std
::shared_ptr<Content> content, dcpomatic::ContentTime p, bool accurate);
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 {
@@
-87,6
+95,7
@@
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 set_eyes (Eyes e);
void set_pad_black (bool p);
@@
-96,21
+105,11
@@
public:
boost::optional<dcpomatic::DCPTime> audio_time () const;
int dropped () 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);
int gets () const;
int audio_callback (void* out, unsigned int frames);
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- void set_background_image (bool b) {
- _background_image = b;
- _video_view->update ();
- }
-
- bool background_image () const {
- return _background_image;
- }
-#endif
-
StateTimer const & state_timer () const {
return _video_view->state_timer ();
}
StateTimer const & state_timer () const {
return _video_view->state_timer ();
}
@@
-122,18
+121,26
@@
public:
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 {
+
std
::shared_ptr<Butler> butler () const {
return _butler;
}
ClosedCaptionsDialog* closed_captions_dialog () const {
return _closed_captions_dialog;
}
void finished ();
return _butler;
}
ClosedCaptionsDialog* closed_captions_dialog () const {
return _closed_captions_dialog;
}
void finished ();
+ void image_changed (std::shared_ptr<PlayerVideo> video);
- boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
+ bool pending_idle_get () const {
+ return _idle_get;
+ }
+
+ boost::signals2::signal<void (std::shared_ptr<PlayerVideo>)> ImageChanged;
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) */
@@
-159,12
+166,12
@@
private:
bool quick_refresh ();
bool quick_refresh ();
-
boost
::shared_ptr<Film> _film;
-
boost
::shared_ptr<Player> _player;
+
std
::shared_ptr<Film> _film;
+
std
::shared_ptr<Player> _player;
VideoView* _video_view;
bool _coalesce_player_changes;
VideoView* _video_view;
bool _coalesce_player_changes;
- std::
list
<int> _pending_player_changes;
+ std::
vector
<int> _pending_player_changes;
/** 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;
@@
-174,7
+181,7
@@
private:
unsigned int _audio_block_size;
bool _playing;
int _suspended;
unsigned int _audio_block_size;
bool _playing;
int _suspended;
-
boost
::shared_ptr<Butler> _butler;
+
std
::shared_ptr<Butler> _butler;
std::list<Frame> _latency_history;
/** Mutex to protect _latency_history */
std::list<Frame> _latency_history;
/** Mutex to protect _latency_history */
@@
-186,15
+193,12
@@
private:
ClosedCaptionsDialog* _closed_captions_dialog;
bool _outline_content;
ClosedCaptionsDialog* _closed_captions_dialog;
bool _outline_content;
+ boost::optional<dcpomatic::Rect<double> > _outline_subtitles;
/** true to pad the viewer panel with black, false to use
the normal window background colour.
*/
bool _pad_black;
/** true to pad the viewer panel with black, false to use
the normal window background colour.
*/
bool _pad_black;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- bool _background_image;
-#endif
-
/** 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;