m_clipMonitor = clipMonitor;
m_projectMonitor = projectMonitor;
- connect(m_clipMonitor->render, SIGNAL(activateMonitor(Kdenlive::MONITORID)), this, SLOT(activateMonitor(Kdenlive::MONITORID)));
- connect(m_projectMonitor->render, SIGNAL(activateMonitor(Kdenlive::MONITORID)), this, SLOT(activateMonitor(Kdenlive::MONITORID)));
+ connect(m_clipMonitor->render, SIGNAL(activateMonitor(Kdenlive::MonitorId)), this, SLOT(activateMonitor(Kdenlive::MonitorId)));
+ connect(m_projectMonitor->render, SIGNAL(activateMonitor(Kdenlive::MonitorId)), this, SLOT(activateMonitor(Kdenlive::MonitorId)));
m_monitorsList.append(clipMonitor);
m_monitorsList.append(projectMonitor);
m_monitorsList.removeAll(monitor);
}
-AbstractMonitor* MonitorManager::monitor(Kdenlive::MONITORID monitorName)
+AbstractMonitor* MonitorManager::monitor(Kdenlive::MonitorId monitorName)
{
AbstractMonitor *monitor = NULL;
for (int i = 0; i < m_monitorsList.size(); ++i) {
if (m_projectMonitor) m_projectMonitor->render->setConsumerProperty(name, value);
}
-bool MonitorManager::activateMonitor(Kdenlive::MONITORID name, bool forceRefresh)
+bool MonitorManager::activateMonitor(Kdenlive::MonitorId name, bool forceRefresh)
{
if (m_clipMonitor == NULL || m_projectMonitor == NULL)
return false;
return false;
}
m_activeMonitor = NULL;
- for (int i = 0; i < m_monitorsList.count(); i++) {
+ for (int i = 0; i < m_monitorsList.count(); ++i) {
if (m_monitorsList.at(i)->id() == name) {
m_activeMonitor = m_monitorsList.at(i);
}
return (m_activeMonitor != NULL);
}
-bool MonitorManager::isActive(Kdenlive::MONITORID id) const
+bool MonitorManager::isActive(Kdenlive::MonitorId id) const
{
return m_activeMonitor ? m_activeMonitor->id() == id: false;
}
void MonitorManager::slotSwitchMonitors(bool activateClip)
{
if (activateClip)
- activateMonitor(Kdenlive::clipMonitor);
+ activateMonitor(Kdenlive::ClipMonitor);
else
- activateMonitor(Kdenlive::projectMonitor);
+ activateMonitor(Kdenlive::ProjectMonitor);
}
void MonitorManager::stopActiveMonitor()
else if (m_activeMonitor == m_projectMonitor) m_projectMonitor->slotEnd();
}
-void MonitorManager::resetProfiles(Timecode tc)
+void MonitorManager::resetProfiles(const Timecode &tc)
{
m_timecode = tc;
slotResetProfiles();
return;
}
blockSignals(true);
- Kdenlive::MONITORID active = m_activeMonitor ? m_activeMonitor->id() : Kdenlive::noMonitor;
+ Kdenlive::MonitorId active = m_activeMonitor ? m_activeMonitor->id() : Kdenlive::NoMonitor;
m_clipMonitor->resetProfile(KdenliveSettings::current_profile());
m_projectMonitor->resetProfile(KdenliveSettings::current_profile());
- if (active != Kdenlive::noMonitor) activateMonitor(active);
+ if (active != Kdenlive::NoMonitor) activateMonitor(active);
blockSignals(false);
if (m_activeMonitor) m_activeMonitor->parentWidget()->raise();
emit checkColorScopes();
if (m_projectMonitor) {
m_projectMonitor->render->analyseAudio = KdenliveSettings::monitor_audio();
}*/
- for (int i = 0; i < m_monitorsList.count(); i++) {
+ for (int i = 0; i < m_monitorsList.count(); ++i) {
if (m_monitorsList.at(i)->abstractRender()) m_monitorsList.at(i)->abstractRender()->analyseAudio = KdenliveSettings::monitor_audio();
}
}