Commit 0884e247 authored by Julius Künzel's avatar Julius Künzel 💬
Browse files

Fix keyframeview position in mixes

parent a93b4c33
...@@ -428,7 +428,7 @@ QVariant AssetParameterModel::data(const QModelIndex &index, int role) const ...@@ -428,7 +428,7 @@ QVariant AssetParameterModel::data(const QModelIndex &index, int role) const
return comment; return comment;
} }
case InRole: case InRole:
return m_asset->get_int("in"); return pCore->getItemIn(m_ownerId);
case OutRole: case OutRole:
return m_asset->get_int("out"); return m_asset->get_int("out");
case ParentInRole: case ParentInRole:
......
...@@ -79,7 +79,7 @@ void TransitionStackView::setModel(const std::shared_ptr<AssetParameterModel> &m ...@@ -79,7 +79,7 @@ void TransitionStackView::setModel(const std::shared_ptr<AssetParameterModel> &m
connect(m_trackBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateTrack(int))); connect(m_trackBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateTrack(int)));
connect(this, &AssetParameterView::seekToPos, [this](int pos) { connect(this, &AssetParameterView::seekToPos, [this](int pos) {
// at this point, the effects returns a pos relative to the clip. We need to convert it to a global time // at this point, the effects returns a pos relative to the clip. We need to convert it to a global time
int clipIn = 0;//pCore->getItemPosition(m_model->getOwnerId()); int clipIn = pCore->getItemPosition(m_model->getOwnerId());
emit seekToTransPos(pos + clipIn); emit seekToTransPos(pos + clipIn);
}); });
emit initKeyframeView(true); emit initKeyframeView(true);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment