#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/noncopyable.hpp>
class Image;
class wxWindow;
class FilmViewer;
+class Player;
class PlayerVideo;
class VideoView : public ExceptionStore, public boost::noncopyable
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;
- /** 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;
-
+ /** Called when playback starts */
virtual void start ();
- /* XXX_b: make pure */
+ /** Called when playback stops */
virtual void stop () {}
+ enum NextFrameResult {
+ FAIL,
+ AGAIN,
+ SUCCESS
+ };
+
+ /** Get the next frame and display it; used after seek */
+ virtual NextFrameResult display_next_frame (bool) = 0;
+
void clear ();
+ 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;
- 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);
return _dropped;
}
+ int errored () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _errored;
+ }
+
int gets () const {
boost::mutex::scoped_lock lm (_mutex);
return _gets;
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;
}
protected:
- /* XXX_b: to remove */
- friend class FilmViewer;
-
- bool get_next_frame (bool non_blocking);
- int time_until_next_frame () const;
+ NextFrameResult get_next_frame (bool non_blocking);
+ boost::optional<int> time_until_next_frame () const;
dcpomatic::DCPTime one_video_frame () const;
int video_frame_rate () const {
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;
}
FilmViewer* _viewer;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- bool _in_watermark;
- int _watermark_x;
- int _watermark_y;
-#endif
-
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;
+ std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
int _video_frame_rate;
/** length of the film we are playing, or 0 if there is none */
dcpomatic::DCPTime _length;
bool _three_d;
int _dropped;
+ int _errored;
int _gets;
};