projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename border line to outline content.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index f7c31468b75e8985c23453654b92189cb625f7d6..2373af122bb387ccffc289111442c416fab0f470 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,27
+18,35
@@
*/
*/
+
/** @file src/film_viewer.h
* @brief FilmViewer class.
*/
/** @file src/film_viewer.h
* @brief FilmViewer class.
*/
+
#include "video_view.h"
#include "video_view.h"
-#include "lib/film.h"
#include "lib/config.h"
#include "lib/config.h"
+#include "lib/film.h"
#include "lib/player_text.h"
#include "lib/player_text.h"
-#include "lib/timer.h"
#include "lib/signaller.h"
#include "lib/signaller.h"
+#include "lib/timer.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <RtAudio.h>
#include <wx/wx.h>
#include <RtAudio.h>
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+#include <vector>
-class wxToggleButton;
+
+class Butler;
+class ClosedCaptionsDialog;
class FFmpegPlayer;
class Image;
class FFmpegPlayer;
class Image;
-class RGBPlusAlphaImage;
-class PlayerVideo;
class Player;
class Player;
-class Butler;
-class ClosedCaptionsDialog;
+class PlayerVideo;
+class RGBPlusAlphaImage;
+class wxToggleButton;
+
/** @class FilmViewer
* @brief A wx widget to view a Film.
/** @class FilmViewer
* @brief A wx widget to view a Film.
@@
-54,19
+62,19
@@
public:
return _video_view->get();
}
return _video_view->get();
}
-
VideoView const *
video_view () const {
+
std::shared_ptr<const VideoView>
video_view () const {
return _video_view;
}
void show_closed_captions ();
return _video_view;
}
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,8
+95,10
@@
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);
+ void set_optimise_for_j2k (bool o);
void slow_refresh ();
void slow_refresh ();
@@
-101,48
+111,40
@@
public:
int audio_callback (void* out, unsigned int frames);
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 ();
}
/* Some accessors and utility methods that VideoView classes need */
StateTimer const & state_timer () const {
return _video_view->state_timer ();
}
/* Some accessors and utility methods that VideoView classes need */
- dcp::Size out_size () const {
- return _out_size;
- }
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);
bool pending_idle_get () const {
return _idle_get;
}
bool pending_idle_get () const {
return _idle_get;
}
- boost::signals2::signal<void (
boost::weak
_ptr<PlayerVideo>)> ImageChanged;
- boost::signals2::signal<void (
dcpomatic::DCPTime
)> Started;
- boost::signals2::signal<void (
dcpomatic::DCPTime
)> Stopped;
+ boost::signals2::signal<void (
std::shared
_ptr<PlayerVideo>)> ImageChanged;
+ boost::signals2::signal<void ()> Started;
+ boost::signals2::signal<void ()> Stopped;
/** While playing back we reached the end of the film (emitted from GUI thread) */
boost::signals2::signal<void ()> Finished;
/** While playing back we reached the end of the film (emitted from GUI thread) */
boost::signals2::signal<void ()> Finished;
+ /** Emitted from the GUI thread when a lot of frames are being dropped */
+ boost::signals2::signal<void()> TooManyDropped;
boost::signals2::signal<bool ()> PlaybackPermitted;
boost::signals2::signal<bool ()> PlaybackPermitted;
@@
-151,6
+153,7
@@
private:
void video_view_sized ();
void calculate_sizes ();
void player_change (ChangeType type, int, bool);
void video_view_sized ();
void calculate_sizes ();
void player_change (ChangeType type, int, bool);
+ void player_change (std::vector<int> properties);
void idle_handler ();
void request_idle_display_next_frame ();
void film_change (ChangeType, Film::Property);
void idle_handler ();
void request_idle_display_next_frame ();
void film_change (ChangeType, Film::Property);
@@
-158,50
+161,50
@@
private:
void config_changed (Config::Property);
void film_length_change ();
void ui_finished ();
void config_changed (Config::Property);
void film_length_change ();
void ui_finished ();
+ void start_audio_stream_if_open ();
dcpomatic::DCPTime uncorrected_time () const;
Frame average_latency () const;
bool quick_refresh ();
dcpomatic::DCPTime uncorrected_time () const;
Frame average_latency () const;
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;
- std::list<int> _pending_player_changes;
-
- /** Size of our output (including padding if we have any) */
- dcp::Size _out_size;
+ std::shared_ptr<VideoView> _video_view;
+ bool _coalesce_player_changes = false;
+ std::vector<int> _pending_player_changes;
RtAudio _audio;
RtAudio _audio;
- int _audio_channels;
- unsigned int _audio_block_size;
- bool _playing;
- int _suspended;
-
boost
::shared_ptr<Butler> _butler;
+ int _audio_channels
= 0
;
+ unsigned int _audio_block_size
= 1024
;
+ bool _playing
= false
;
+ int _suspended
= 0
;
+
std
::shared_ptr<Butler> _butler;
std::list<Frame> _latency_history;
/** Mutex to protect _latency_history */
mutable boost::mutex _latency_history_mutex;
std::list<Frame> _latency_history;
/** Mutex to protect _latency_history */
mutable boost::mutex _latency_history_mutex;
- int _latency_history_count;
+ int _latency_history_count
= 0
;
boost::optional<int> _dcp_decode_reduction;
boost::optional<int> _dcp_decode_reduction;
- ClosedCaptionsDialog* _closed_captions_dialog;
+ /** true to assume that this viewer is only being used for JPEG2000 sources
+ * so it can optimise accordingly.
+ */
+ bool _optimise_for_j2k = false;
+
+ ClosedCaptionsDialog* _closed_captions_dialog = nullptr;
- bool _outline_content;
+ bool _outline_content = false;
+ boost::optional<dcpomatic::Rect<double>> _outline_subtitles;
/** 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.
*/
- bool _pad_black;
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- bool _background_image;
-#endif
+ bool _pad_black = false;
/** true if an get() is required next time we are idle */
/** true if an get() is required next time we are idle */
- bool _idle_get;
+ bool _idle_get
= false
;
boost::signals2::scoped_connection _config_changed_connection;
};
boost::signals2::scoped_connection _config_changed_connection;
};