projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a60b5f3
)
Don't set up new film several times when setting up new SPL in player.
author
Carl Hetherington
<cth@carlh.net>
Sat, 20 Oct 2018 20:10:54 +0000
(21:10 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 20 Oct 2018 20:10:54 +0000
(21:10 +0100)
src/tools/dcpomatic_player.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_player.cc
b/src/tools/dcpomatic_player.cc
index 237b769bbf610c82bc6f369272c42cb2651e32e6..a4333db827d4c4a9de2167e34559d00b07771b13 100644
(file)
--- a/
src/tools/dcpomatic_player.cc
+++ b/
src/tools/dcpomatic_player.cc
@@
-500,14
+500,15
@@
public:
_film->set_three_d (true);
}
_film->set_three_d (true);
}
- _viewer->set_film (_film);
- _viewer->seek (DCPTime(), true);
- _info->triggered_update ();
-
- set_menu_sensitivity ();
_controls->log (wxString::Format(_("Load DCP %s"), i.directory.filename().string().c_str()));
}
_controls->log (wxString::Format(_("Load DCP %s"), i.directory.filename().string().c_str()));
}
+ _viewer->set_film (_film);
+ _viewer->seek (DCPTime(), true);
+ _info->triggered_update ();
+
+ set_menu_sensitivity ();
+
wxMenuItemList old = _cpl_menu->GetMenuItems();
for (wxMenuItemList::iterator i = old.begin(); i != old.end(); ++i) {
_cpl_menu->Remove (*i);
wxMenuItemList old = _cpl_menu->GetMenuItems();
for (wxMenuItemList::iterator i = old.begin(); i != old.end(); ++i) {
_cpl_menu->Remove (*i);