projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
656c340
)
Fix display when all content is removed. Fix sensitivity of jump-to-selected checkbox.
author
Carl Hetherington
<cth@carlh.net>
Tue, 18 Apr 2017 09:05:22 +0000
(10:05 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 19 Apr 2017 22:04:32 +0000
(23:04 +0100)
src/wx/film_viewer.cc
patch
|
blob
|
history
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index fcaca297365b4f947909cc92608915f97cfb4210..2aef50c6ddf85b3f12f2316f1b3eb23ea2b1bb9b 100644
(file)
--- a/
src/wx/film_viewer.cc
+++ b/
src/wx/film_viewer.cc
@@
-254,9
+254,14
@@
FilmViewer::get ()
pair<shared_ptr<PlayerVideo>, DCPTime> video;
do {
video = _butler->get_video ();
pair<shared_ptr<PlayerVideo>, DCPTime> video;
do {
video = _butler->get_video ();
- } while (_film->three_d() && ((_left_eye->GetValue() && video.first->eyes() == EYES_RIGHT) || (_right_eye->GetValue() && video.first->eyes() == EYES_LEFT)));
+ } while (
+ _film->three_d() &&
+ ((_left_eye->GetValue() && video.first->eyes() == EYES_RIGHT) || (_right_eye->GetValue() && video.first->eyes() == EYES_LEFT))
+ );
if (!video.first) {
if (!video.first) {
+ _frame.reset ();
+ refresh_panel ();
return;
}
return;
}
@@
-575,6
+580,7
@@
FilmViewer::setup_sensitivity ()
_outline_content->Enable (c);
_frame_number->Enable (c);
_timecode->Enable (c);
_outline_content->Enable (c);
_frame_number->Enable (c);
_timecode->Enable (c);
+ _jump_to_selected->Enable (c);
_left_eye->Enable (c && _film->three_d ());
_right_eye->Enable (c && _film->three_d ());
_left_eye->Enable (c && _film->three_d ());
_right_eye->Enable (c && _film->three_d ());