Commit c26ef97b authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Merge branch '1912'

parents b2fa3d16 01a4bd3a
Pipeline #11385 passed with stage
in 14 minutes and 19 seconds
......@@ -373,7 +373,7 @@ ObjectId EffectStackView::stackOwner() const
bool EffectStackView::addEffect(const QString &effectId)
{
if (m_model) {
return m_model->appendEffect(effectId);
return m_model->appendEffect(effectId, true);
}
return false;
}
......
......@@ -646,6 +646,7 @@ void GLWidget::wheelEvent(QWheelEvent *event)
void GLWidget::requestSeek(int position)
{
m_consumer->set("scrub_audio", 1);
m_producer->seek(position);
if (!qFuzzyIsNull(m_producer->get_speed())) {
m_consumer->purge();
......@@ -659,6 +660,7 @@ void GLWidget::requestSeek(int position)
void GLWidget::requestRefresh()
{
if (m_producer && qFuzzyIsNull(m_producer->get_speed())) {
m_consumer->set("scrub_audio", 0);
m_refreshTimer.start();
}
}
......@@ -1616,6 +1618,7 @@ void GLWidget::switchPlay(bool play, double speed)
}
m_producer->set_speed(speed);
m_consumer->start();
m_consumer->set("scrub_audio", 0);
m_consumer->set("refresh", 1);
} else {
emit paused();
......@@ -1640,6 +1643,7 @@ bool GLWidget::playZone(bool loop)
if (m_consumer->is_stopped()) {
m_consumer->start();
}
m_consumer->set("scrub_audio", 0);
m_consumer->set("refresh", 1);
m_isZoneMode = true;
m_isLoopMode = loop;
......@@ -1660,6 +1664,7 @@ bool GLWidget::loopClip()
if (m_consumer->is_stopped()) {
m_consumer->start();
}
m_consumer->set("scrub_audio", 0);
m_consumer->set("refresh", 1);
m_isZoneMode = true;
m_isLoopMode = true;
......
......@@ -329,7 +329,7 @@ bool ClipModel::addEffect(const QString &effectId)
} else if (m_currentState == PlaylistState::AudioOnly) {
return false;
}
m_effectStack->appendEffect(effectId);
m_effectStack->appendEffect(effectId, true);
return true;
}
......
Markdown is supported
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