projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various thread cleanups.
[dcpomatic.git]
/
src
/
wx
/
video_view.h
diff --git
a/src/wx/video_view.h
b/src/wx/video_view.h
index fd2684e4175a3d6a47e98f8dcc3d0affa2eca8d4..f9e0670435ed13edaa2e919cc373e11d12a0a48d 100644
(file)
--- a/
src/wx/video_view.h
+++ b/
src/wx/video_view.h
@@
-24,40
+24,42
@@
#include "lib/dcpomatic_time.h"
#include "lib/timer.h"
#include "lib/types.h"
#include "lib/dcpomatic_time.h"
#include "lib/timer.h"
#include "lib/types.h"
+#include "lib/exception_store.h"
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include <boost/thread.hpp>
+#include <boost/noncopyable.hpp>
class Image;
class wxWindow;
class FilmViewer;
class PlayerVideo;
class Image;
class wxWindow;
class FilmViewer;
class PlayerVideo;
-class VideoView
+class VideoView
: public ExceptionStore, public boost::noncopyable
{
public:
VideoView (FilmViewer* viewer);
virtual ~VideoView () {}
{
public:
VideoView (FilmViewer* viewer);
virtual ~VideoView () {}
- virtual void set_image (boost::shared_ptr<const Image> image) = 0;
+ /** @return the thing displaying the image */
virtual wxWindow* get () const = 0;
virtual wxWindow* get () const = 0;
- /** Redraw the view after something has changed like content outlining,
- * the film being removed, etc.
- */
+ /** Re-make and display the image from the current _player_video */
virtual void update () = 0;
virtual void update () = 0;
-
+ /** Called when playback starts */
virtual void start ();
virtual void start ();
- /*
XXX_b: make pure
*/
+ /*
* Called when playback stops
*/
virtual void stop () {}
virtual void stop () {}
+ /** Get the next frame and display it; used after seek */
+ virtual bool display_next_frame (bool) = 0;
void clear ();
void clear ();
+ bool refresh_metadata (boost::shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size);
+ /** Emitted from the GUI thread when our display changes in size */
boost::signals2::signal<void()> Sized;
boost::signals2::signal<void()> Sized;
- virtual bool display_next_frame (bool) = 0;
- /* XXX_b: to remove */
- virtual void display_player_video () {}
+ /* Accessors for FilmViewer */
int dropped () const {
boost::mutex::scoped_lock lm (_mutex);
int dropped () const {
boost::mutex::scoped_lock lm (_mutex);
@@
-78,6
+80,11
@@
public:
return _player_video.second;
}
return _player_video.second;
}
+
+ /* Setters for FilmViewer so it can tell us our state and
+ * we can then use (thread) safely.
+ */
+
void set_video_frame_rate (int r) {
boost::mutex::scoped_lock lm (_mutex);
_video_frame_rate = r;
void set_video_frame_rate (int r) {
boost::mutex::scoped_lock lm (_mutex);
_video_frame_rate = r;
@@
-93,12
+100,14
@@
public:
_eyes = eyes;
}
_eyes = eyes;
}
-protected:
- /* XXX_b: to remove */
- friend class FilmViewer;
+ void set_three_d (bool t) {
+ boost::mutex::scoped_lock lm (_mutex);
+ _three_d = t;
+ }
+protected:
bool get_next_frame (bool non_blocking);
bool get_next_frame (bool non_blocking);
-
int
time_until_next_frame () const;
+
boost::optional<int>
time_until_next_frame () const;
dcpomatic::DCPTime one_video_frame () const;
int video_frame_rate () const {
dcpomatic::DCPTime one_video_frame () const;
int video_frame_rate () const {
@@
-137,7
+146,7
@@
protected:
StateTimer _state_timer;
private:
StateTimer _state_timer;
private:
- /** Mutex protecting all the state in
VideoView
*/
+ /** Mutex protecting all the state in
this class
*/
mutable boost::mutex _mutex;
std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
mutable boost::mutex _mutex;
std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
@@
-145,6
+154,7
@@
private:
/** length of the film we are playing, or 0 if there is none */
dcpomatic::DCPTime _length;
Eyes _eyes;
/** length of the film we are playing, or 0 if there is none */
dcpomatic::DCPTime _length;
Eyes _eyes;
+ bool _three_d;
int _dropped;
int _gets;
int _dropped;
int _gets;