projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable warnings around all wx includes.
[dcpomatic.git]
/
src
/
wx
/
video_view.h
diff --git
a/src/wx/video_view.h
b/src/wx/video_view.h
index e5fbb671dd20e7f770fee744a5c8c676fd45d509..cf5e09da0a8ff9444a05839cc6bce12ad4cbe5f9 100644
(file)
--- a/
src/wx/video_view.h
+++ b/
src/wx/video_view.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2019
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,30
+18,40
@@
*/
*/
+
#ifndef DCPOMATIC_VIDEO_VIEW_H
#define DCPOMATIC_VIDEO_VIEW_H
#ifndef DCPOMATIC_VIDEO_VIEW_H
#define DCPOMATIC_VIDEO_VIEW_H
+
#include "lib/dcpomatic_time.h"
#include "lib/dcpomatic_time.h"
+#include "lib/exception_store.h"
+#include "lib/signaller.h"
#include "lib/timer.h"
#include "lib/types.h"
#include "lib/timer.h"
#include "lib/types.h"
-#include "lib/exception_store.h"
-#include <boost/shared_ptr.hpp>
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/signals2.hpp>
#include <boost/thread.hpp>
#include <boost/signals2.hpp>
#include <boost/thread.hpp>
-#include <boost/noncopyable.hpp>
-class Image;
-class wxWindow;
+
class FilmViewer;
class FilmViewer;
+class Image;
class Player;
class PlayerVideo;
class Player;
class PlayerVideo;
+class wxWindow;
-class VideoView : public ExceptionStore, public boost::noncopyable
+
+class VideoView : public ExceptionStore, public Signaller
{
public:
VideoView (FilmViewer* viewer);
virtual ~VideoView () {}
{
public:
VideoView (FilmViewer* viewer);
virtual ~VideoView () {}
+ VideoView (VideoView const&) = delete;
+ VideoView& operator= (VideoView const&) = delete;
+
/** @return the thing displaying the image */
virtual wxWindow* get () const = 0;
/** Re-make and display the image from the current _player_video */
/** @return the thing displaying the image */
virtual wxWindow* get () const = 0;
/** Re-make and display the image from the current _player_video */
@@
-61,10
+71,12
@@
public:
virtual NextFrameResult display_next_frame (bool) = 0;
void clear ();
virtual NextFrameResult display_next_frame (bool) = 0;
void clear ();
- bool reset_metadata (
boost
::shared_ptr<const Film> film, dcp::Size player_video_container_size);
+ bool reset_metadata (
std
::shared_ptr<const Film> film, dcp::Size player_video_container_size);
/** Emitted from the GUI thread when our display changes in size */
boost::signals2::signal<void()> Sized;
/** Emitted from the GUI thread when our display changes in size */
boost::signals2::signal<void()> Sized;
+ /** Emitted from the GUI thread when a lot of frames are being dropped */
+ boost::signals2::signal<void()> TooManyDropped;
/* Accessors for FilmViewer */
/* Accessors for FilmViewer */
@@
-118,11
+130,25
@@
public:
_three_d = t;
}
_three_d = t;
}
+ void set_optimise_for_j2k (bool o) {
+ _optimise_for_j2k = o;
+ }
+
protected:
NextFrameResult get_next_frame (bool non_blocking);
boost::optional<int> time_until_next_frame () const;
dcpomatic::DCPTime one_video_frame () const;
protected:
NextFrameResult get_next_frame (bool non_blocking);
boost::optional<int> time_until_next_frame () const;
dcpomatic::DCPTime one_video_frame () const;
+ wxColour pad_colour () const;
+
+ wxColour outline_content_colour () const {
+ return wxColour(255, 0, 0);
+ }
+
+ wxColour outline_subtitles_colour () const {
+ return wxColour(0, 255, 0);
+ }
+
int video_frame_rate () const {
boost::mutex::scoped_lock lm (_mutex);
return _video_frame_rate;
int video_frame_rate () const {
boost::mutex::scoped_lock lm (_mutex);
return _video_frame_rate;
@@
-133,15
+159,12
@@
protected:
return _length;
}
return _length;
}
- std::pair<
boost
::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> player_video () const {
+ std::pair<
std
::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> player_video () const {
boost::mutex::scoped_lock lm (_mutex);
return _player_video;
}
boost::mutex::scoped_lock lm (_mutex);
return _player_video;
}
- void add_dropped () {
- boost::mutex::scoped_lock lm (_mutex);
- ++_dropped;
- }
+ void add_dropped ();
void add_get () {
boost::mutex::scoped_lock lm (_mutex);
void add_get () {
boost::mutex::scoped_lock lm (_mutex);
@@
-152,20
+175,24
@@
protected:
StateTimer _state_timer;
StateTimer _state_timer;
+ bool _optimise_for_j2k = false;
+
private:
/** Mutex protecting all the state in this class */
mutable boost::mutex _mutex;
private:
/** Mutex protecting all the state in this class */
mutable boost::mutex _mutex;
- std::pair<
boost
::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
- int _video_frame_rate;
+ std::pair<
std
::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
+ int _video_frame_rate
= 0
;
/** length of the film we are playing, or 0 if there is none */
dcpomatic::DCPTime _length;
/** length of the film we are playing, or 0 if there is none */
dcpomatic::DCPTime _length;
- Eyes _eyes;
- bool _three_d;
+ Eyes _eyes
= Eyes::LEFT
;
+ bool _three_d
= false
;
- int _dropped;
- int _errored;
- int _gets;
+ int _dropped = 0;
+ struct timeval _dropped_check_period_start;
+ int _errored = 0;
+ int _gets = 0;
};
};
+
#endif
#endif