From 23887074ff40ab84134fe5b99bf301b943f6e3b6 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Tue, 29 Jul 2008 19:48:44 +0000 Subject: [PATCH] Fix clip monitor staying blue when opening project svn path=/branches/KDE4/; revision=2348 --- src/monitor.cpp | 2 +- src/projectlist.cpp | 5 ----- src/renderer.cpp | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/monitor.cpp b/src/monitor.cpp index a87e389d..45405e31 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -302,7 +302,7 @@ void Monitor::slotSetXml(DocClipBase *clip, const int position) { if (render == NULL) return; if (!m_isActive) m_monitorManager->activateMonitor(m_name); if (!clip) return; - if (clip != m_currentClip) { + if (clip != m_currentClip || m_currentClip->producer() == NULL) { m_currentClip = clip; render->setProducer(clip->producer(), 0); m_ruler->slotNewValue(0); diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 7356ed5e..e9327b44 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -143,11 +143,6 @@ void ProjectList::setRenderer(Render *projectRender) { void ProjectList::slotClipSelected() { ProjectItem *item = static_cast (listView->currentItem()); if (item && !item->isGroup()) { - if (item == m_selectedItem) { - // if user clicked on the active clip item, just focus monitor, don't update it. - emit clipSelected(NULL); - return; - } m_selectedItem = item; emit clipSelected(item->referencedClip()); } diff --git a/src/renderer.cpp b/src/renderer.cpp index 43a7537f..0340fd6d 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -667,7 +667,7 @@ void Render::setProducer(Mlt::Producer *producer, int position) { m_fps = m_mltProducer->get_fps(); connectPlaylist(); - if (position != 0) { + if (position != -1) { m_mltProducer->seek(position); emit rendererPosition(position); } -- 2.39.2