[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/next] src: Fix clip monitor not working when adding a clip
From:       Vincent PINON <vincent.pinon () laposte ! net>
Date:       2014-04-30 20:27:57
Message-ID: E1Wfb6j-0003AX-Ju () scm ! kde ! org
[Download RAW message or body]

Git commit b7626cc194ea822b0560d585d983fbbf483a5502 by Vincent PINON, on behalf of Jean-Baptiste Mardelle.
Committed on 31/03/2014 at 18:09.
Pushed by vpinon into branch 'next'.

Fix clip monitor not working when adding a clip

M  +4    -6    src/projectlist.cpp

http://commits.kde.org/kdenlive/b7626cc194ea822b0560d585d983fbbf483a5502

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index a199c48..562b187 100644
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -1372,7 +1372,7 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties)
         }
     }
     monitorItemEditing(true);
-    updateButtons();
+    if (!getProperties) updateButtons();
 }
 
 void ProjectList::slotGotProxy(const QString &proxyPath)
@@ -2280,9 +2280,6 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
     if (item && producer) {
         monitorItemEditing(false);
         DocClipBase *clip = item->referencedClip();
-        if (clip->getProducer() == NULL && replace) {
-	    replace = false;
-	}
         if (producer->is_valid()) {
             if (clip->isPlaceHolder()) {
                 clip->setValid();
@@ -2341,8 +2338,9 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
     if (queue == 0) {
         monitorItemEditing(true);
         if (item && m_thumbnailQueue.isEmpty()) {
-            if (!item->hasProxy() || m_render->activeClipId() == item->clipId())
+            if (!item->hasProxy() || m_render->activeClipId() == item->clipId()) {
                 m_listView->setCurrentItem(item);
+            }
             bool updatedProfile = false;
             if (item->parent()) {
                 if (item->parent()->type() == ProjectFoldeType)
@@ -2355,7 +2353,7 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
                 }
             }
             if (updatedProfile == false) {
-                //emit clipSelected(item->referencedClip());
+                emit clipSelected(item->referencedClip());
             }
         } else {
             int max = m_doc->clipManager()->clipsCount();

[prev in list] [next in list] [prev in thread] [next in thread]