Mercurial > hg > svgui
diff view/Overview.cpp @ 1486:ac0a8addabcf
Merge from branch by-id
author | Chris Cannam |
---|---|
date | Wed, 17 Jul 2019 14:25:16 +0100 |
parents | e540aa5d89cd |
children | a0b2f3b4dd2f |
line wrap: on
line diff
--- a/view/Overview.cpp Thu Jun 13 15:35:01 2019 +0100 +++ b/view/Overview.cpp Wed Jul 17 14:25:16 2019 +0100 @@ -42,7 +42,7 @@ } void -Overview::modelChangedWithin(sv_frame_t startFrame, sv_frame_t endFrame) +Overview::modelChangedWithin(ModelId modelId, sv_frame_t startFrame, sv_frame_t endFrame) { using namespace std::rel_ops; @@ -60,9 +60,8 @@ if (m_modelTestTime.elapsed() < 1000) { for (LayerList::const_iterator i = m_layerStack.begin(); i != m_layerStack.end(); ++i) { - if ((*i)->getModel() && - (!(*i)->getModel()->isOK() || - !(*i)->getModel()->isReady())) { + auto model = ModelById::get((*i)->getModel()); + if (model && (!model->isOK() || !model->isReady())) { return; } } @@ -71,7 +70,7 @@ } } - View::modelChangedWithin(startFrame, endFrame); + View::modelChangedWithin(modelId, startFrame, endFrame); } void