Fixed: All scopes were working forever when the input image had size 0

[kdenlive] / src / customtrackview.cpp

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 5a0af438daaf5f1af973375859979fa45244243b..1730722c418ea0aee77d50aec8ffdac385d73b8d 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -914,7 +914,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
         bool selected = !m_dragItem->isSelected();
         if (dragGroup)
             dragGroup->setSelected(selected);
-        else 
+        else
             m_dragItem->setSelected(selected);
 
         groupSelectedItems();
@@ -2969,12 +2969,14 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
                         trackTransitionStartList[m_document->tracksCount() - info.track] = info.startPos.frames(m_document->fps());
                 }
             }
-
-            InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, timeOffset, false);
-            m_commandStack->push(command);
-            if (track != -1) track = m_document->tracksCount() - track;
-            kDebug() << "SPACER TRACK:" << track;
-            m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, timeOffset, GenTime());
+            if (!clipsToMove.isEmpty() || !transitionsToMove.isEmpty()) {
+                InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, timeOffset, false);
+                m_commandStack->push(command);
+                if (track != -1) track = m_document->tracksCount() - track;
+                kDebug() << "SPACER TRACK:" << track;
+                m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, timeOffset, GenTime());
+                setDocumentModified();
+            }
         }
         resetSelectionGroup(false);
         m_operationMode = NONE;
@@ -2999,10 +3001,10 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
             if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
                 ClipItem *item = static_cast <ClipItem *>(m_dragItem);
                 Mlt::Producer *prod;
-                if (item->isAudioOnly()) prod = item->baseClip()->audioProducer(m_dragItemInfo.track);
+                if (item->isAudioOnly()) prod = item->baseClip()->audioProducer(info.track);
                 else if (item->isVideoOnly()) prod = item->baseClip()->videoProducer();
-                else prod = item->baseClip()->producer(m_dragItemInfo.track);
-                bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), prod, m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT);
+                else prod = item->baseClip()->producer(info.track);
+                bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - info.track), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(info.startPos.frames(m_document->fps())), prod, m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT);
 
                 if (success) {
                     QUndoCommand *moveCommand = new QUndoCommand();
@@ -3137,6 +3139,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
                     adjustTimelineTransitions(m_scene->editMode(), transition, moveCommand);
                     new MoveTransitionCommand(this, m_dragItemInfo, info, false, moveCommand);
                     m_commandStack->push(moveCommand);
+                    setDocumentModified();
                 }
             }
         } else {
@@ -3221,7 +3224,6 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
                         m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
                     }
                 }
-                rebuildGroup((AbstractGroupItem *)group);
                 new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false, moveGroup);
                 m_commandStack->push(moveGroup);
 
@@ -3233,6 +3235,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
                 if (m_selectionGroup) {
                     m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
                     m_selectionGroupInfo.track = m_selectionGroup->track();
+                } else {
+                    rebuildGroup((AbstractGroupItem *)group);
                 }
                 setDocumentModified();
             }
@@ -3683,7 +3687,7 @@ void CustomTrackView::slotRazorGroup(QList <ItemInfo> clips1, QList <ItemInfo> t
                 break;
             }
         }
-        for(int i = 0; i < clipsCut.count(); ++i)
+        for (int i = 0; i < clipsCut.count(); ++i)
             cutClip(clipsCut.at(i), cutPos, false);
         // TODO: uncut transitonsCut
         doGroupClips(QList <ItemInfo>() << clips1 << clipsCut << clips2, QList <ItemInfo>() << transitions1 << transitionsCut << transitions2, true);
@@ -3774,6 +3778,27 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i
         emit displayMessage(i18n("No clip copied"), ErrorMessage);
         return;
     }
+
+    if (baseclip->producer() == NULL) {
+        // If the clip has no producer, we must wait until it is created...
+        m_mutex.lock();
+        emit displayMessage(i18n("Waiting for clip..."), InformationMessage);
+        emit forceClipProcessing(clipId);
+        qApp->processEvents();
+        for (int i = 0; i < 3; i++) {
+            if (baseclip->producer() == NULL) {
+                m_producerNotReady.wait(&m_mutex, 500 + 500 * i);
+            } else break;
+        }
+        if (baseclip->producer() == NULL) {
+            emit displayMessage(i18n("Cannot insert clip..."), ErrorMessage);
+            m_mutex.unlock();
+            return;
+        }
+        emit displayMessage(QString(), InformationMessage);
+        m_mutex.unlock();
+    }
+
     ClipItem *item = new ClipItem(baseclip, info, m_document->fps(), xml.attribute("speed", "1").toDouble(), xml.attribute("strobe", "1").toInt());
     item->setEffectList(effects);
     if (xml.hasAttribute("audio_only")) item->setAudioOnly(true);
@@ -5334,7 +5359,7 @@ void CustomTrackView::slotUpdateAllThumbs()
     for (int i = 0; i < itemList.count(); i++) {
         if (itemList.at(i)->type() == AVWIDGET) {
             item = static_cast <ClipItem *>(itemList.at(i));
-            if (item->clipType() != COLOR && item->clipType() != AUDIO) {
+            if (item && item->isEnabled() && item->clipType() != COLOR && item->clipType() != AUDIO) {
                 // Check if we have a cached thumbnail
                 if (item->clipType() == IMAGE || item->clipType() == TEXT) {
                     QString thumb = thumbBase + item->baseClip()->getClipHash() + "_0.png";
@@ -5359,9 +5384,8 @@ void CustomTrackView::slotUpdateAllThumbs()
                         item->slotSetEndThumb(pix);
                     }
                 }
+               item->refreshClip(false);
             }
-            item->refreshClip(false);
-            //qApp->processEvents();
         }
     }
     viewport()->update();
@@ -6192,3 +6216,19 @@ void CustomTrackView::setTipAnimation(AbstractClipItem *clip, OPERATIONTYPE mode
         m_animationTimer->start();
     }
 }
+
+bool CustomTrackView::hasAudio(int track) const
+{
+    QRectF rect(0, (double)(track * m_tracksHeight + 1), (double) sceneRect().width(), (double)(m_tracksHeight - 1));
+    QList<QGraphicsItem *> collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect);
+    QGraphicsItem *item;
+    for (int i = 0; i < collisions.count(); i++) {
+        item = collisions.at(i);
+        if (!item->isEnabled()) continue;
+        if (item->type() == AVWIDGET) {
+            ClipItem *clip = static_cast <ClipItem *>(item);
+            if (!clip->isVideoOnly() && (clip->clipType() == AUDIO || clip->clipType() == AV || clip->clipType() == PLAYLIST)) return true;
+        }
+    }
+    return false;
+}