projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
efc3486
)
Fix deadlock.
author
Carl Hetherington
<cth@carlh.net>
Fri, 10 Jan 2020 14:13:35 +0000
(15:13 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 10 Jan 2020 14:13:35 +0000
(15:13 +0100)
src/wx/video_view.cc
patch
|
blob
|
history
diff --git
a/src/wx/video_view.cc
b/src/wx/video_view.cc
index 4edc2cd23a28cf0f3b943fe3a9d6cb409fecd973..014524757169cfad6140ee5b541f2a6ab0f46856 100644
(file)
--- a/
src/wx/video_view.cc
+++ b/
src/wx/video_view.cc
@@
-24,6
+24,7
@@
#include "lib/butler.h"
#include <boost/optional.hpp>
#include "lib/butler.h"
#include <boost/optional.hpp>
+using std::pair;
using boost::shared_ptr;
using boost::optional;
using boost::shared_ptr;
using boost::optional;
@@
-118,12
+119,12
@@
VideoView::start ()
bool
VideoView::refresh_metadata (shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size)
{
bool
VideoView::refresh_metadata (shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size)
{
-
boost::mutex::scoped_lock lm (_mutex
);
- if (!
_player_video
.first) {
+
pair<shared_ptr<PlayerVideo>, dcpomatic::DCPTime> pv = player_video (
);
+ if (!
pv
.first) {
return false;
}
return false;
}
- if (!
_player_video
.first->reset_metadata (film, video_container_size, film_frame_size)) {
+ if (!
pv
.first->reset_metadata (film, video_container_size, film_frame_size)) {
return false;
}
return false;
}