Commit b3cb1389 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Minor improvement to show clip in project bin

parent 2a0c0d91
......@@ -1309,6 +1309,8 @@ void Bin::selectClipById(const QString &clipId, int frame, const QPoint &zone)
}
if (frame > -1) {
m_monitor->slotSeek(frame);
} else {
m_monitor->slotActivateMonitor();
}
if (!zone.isNull()) {
m_monitor->slotLoadClipZone(zone);
......
......@@ -2825,9 +2825,6 @@ void MainWindow::slotClipInProjectTree()
int duration = pCore->getItemDuration(id);
QPoint zone(start, start + duration);
qDebug() << " - - selecting clip on monitor, zone: " << zone;
if (m_projectMonitor->isActive()) {
slotSwitchMonitors();
}
int pos = m_projectMonitor->position();
int itemPos = pCore->getItemPosition(id);
if (pos >= itemPos && pos < itemPos + duration) {
......
......@@ -1374,7 +1374,7 @@ void Monitor::slotOpenClip(const std::shared_ptr<ProjectClip> &controller, int i
}
m_audioMeterWidget->audioChannels = controller->audioInfo() ? controller->audioInfo()->channels() : 0;
if (!m_controller->hasVideo() || KdenliveSettings::displayClipMonitorInfo() & 0x10) {
m_glMonitor->getControllerProxy()->setAudioThumb(ThumbnailCache::get()->getAudioThumbPath(m_controller->clipId()));
m_glMonitor->getControllerProxy()->setAudioThumb(m_audioMeterWidget->audioChannels == 0 ? QUrl() : ThumbnailCache::get()->getAudioThumbPath(m_controller->clipId()));
}
m_controller->getMarkerModel()->registerSnapModel(m_snaps);
m_glMonitor->getControllerProxy()->setClipProperties(controller->clipType(), controller->hasAudioAndVideo(), controller->clipName());
......
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