summaryrefslogtreecommitdiff
path: root/src/wx/film_viewer.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-04 21:16:53 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-07 22:48:29 +0100
commitdd9be86db6cde0afa5da0d1d1ac43b42e05dca26 (patch)
treee56a3f82fb9e1c8602f265bea0d0688d8a018644 /src/wx/film_viewer.h
parent0d35820cf50d2789752b8776683b26d04642518d (diff)
std::shared_ptr
Diffstat (limited to 'src/wx/film_viewer.h')
-rw-r--r--src/wx/film_viewer.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 15d6bfaf5..909bf0ac7 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -63,13 +63,13 @@ public:
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);
- 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 {
@@ -122,20 +122,20 @@ public:
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 ();
- void image_changed (boost::shared_ptr<PlayerVideo> video);
+ void image_changed (std::shared_ptr<PlayerVideo> video);
bool pending_idle_get () const {
return _idle_get;
}
- boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>)> ImageChanged;
+ 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) */
@@ -162,8 +162,8 @@ private:
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;
@@ -177,7 +177,7 @@ private:
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 */