X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitormanager.cpp;h=c7fe6b505e0fad8d3d31b46884c16d5e046db4dd;hb=3689ca2874624a10dc00efbbf143bfeff811c579;hp=8d0d2341b83929e018a35c8de7f50efd1cd09201;hpb=1aac796b291b5e0061f94665f79d734e559f2189;p=kdenlive diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp index 8d0d2341..c7fe6b50 100644 --- a/src/monitormanager.cpp +++ b/src/monitormanager.cpp @@ -28,6 +28,7 @@ #include #include + MonitorManager::MonitorManager(QWidget *parent) : QObject(parent), m_clipMonitor(NULL), @@ -187,24 +188,18 @@ void MonitorManager::slotResetProfiles() if (m_projectMonitor == NULL || m_clipMonitor == NULL) return; blockSignals(true); QString active = m_activeMonitor ? m_activeMonitor->name() : QString(); - if (!m_clipMonitor->render->hasProfile(KdenliveSettings::current_profile())) { - activateMonitor("clip"); - m_clipMonitor->resetProfile(KdenliveSettings::current_profile()); - m_clipMonitor->updateTimecodeFormat(); - } - if (!m_projectMonitor->render->hasProfile(KdenliveSettings::current_profile())) { - activateMonitor("project"); - m_projectMonitor->resetProfile(KdenliveSettings::current_profile()); - m_projectMonitor->updateTimecodeFormat(); - } + m_clipMonitor->resetProfile(KdenliveSettings::current_profile()); + m_projectMonitor->resetProfile(KdenliveSettings::current_profile()); if (!active.isEmpty()) activateMonitor(active); blockSignals(false); if (m_activeMonitor) m_activeMonitor->parentWidget()->raise(); emit checkColorScopes(); } -void MonitorManager::slotRefreshCurrentMonitor() +void MonitorManager::slotRefreshCurrentMonitor(const QString &id) { + // Clip producer was modified, check if clip is currently displayed in clip monitor + m_clipMonitor->reloadProducer(id); if (m_activeMonitor == m_clipMonitor) m_clipMonitor->refreshMonitor(); else m_projectMonitor->refreshMonitor(); }