projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
wx
/
video_view.h
diff --git
a/src/wx/video_view.h
b/src/wx/video_view.h
index 2b4bd47179ae861c4bc5e68055a98a339cb47b7e..3b596197e42c82bca0bbeab977752a51f2f9ba37 100644
(file)
--- a/
src/wx/video_view.h
+++ b/
src/wx/video_view.h
@@
-25,7
+25,6
@@
#include "lib/timer.h"
#include "lib/types.h"
#include "lib/exception_store.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/noncopyable.hpp>
#include <boost/signals2.hpp>
#include <boost/thread.hpp>
#include <boost/noncopyable.hpp>
@@
-50,11
+49,18
@@
public:
virtual void start ();
/** Called when playback stops */
virtual void stop () {}
virtual void start ();
/** Called when playback stops */
virtual void stop () {}
+
+ enum NextFrameResult {
+ FAIL,
+ AGAIN,
+ SUCCESS
+ };
+
/** Get the next frame and display it; used after seek */
/** Get the next frame and display it; used after seek */
- virtual
bool
display_next_frame (bool) = 0;
+ virtual
NextFrameResult
display_next_frame (bool) = 0;
void clear ();
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;
@@
-112,7
+118,7
@@
public:
}
protected:
}
protected:
-
bool
get_next_frame (bool non_blocking);
+
NextFrameResult
get_next_frame (bool non_blocking);
boost::optional<int> time_until_next_frame () const;
dcpomatic::DCPTime one_video_frame () const;
boost::optional<int> time_until_next_frame () const;
dcpomatic::DCPTime one_video_frame () const;
@@
-126,7
+132,7
@@
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;
}
@@
-149,7
+155,7
@@
private:
/** Mutex protecting all the state in this class */
mutable boost::mutex _mutex;
/** 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;
int _video_frame_rate;
/** length of the film we are playing, or 0 if there is none */
dcpomatic::DCPTime _length;