]> git.sesse.net Git - kdenlive/commitdiff
Fix bug in previous commit
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Sun, 4 Nov 2012 23:47:36 +0000 (00:47 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Sun, 4 Nov 2012 23:47:36 +0000 (00:47 +0100)
src/clipitem.cpp
src/clipitem.h
src/customtrackview.cpp
src/effectstack/parametercontainer.cpp

index 14389f9af6a91740de186186284beed4273dbdea..8670aed359afdb6e0b5b8b97f1b3c11e8f6f2de4 100644 (file)
@@ -1273,7 +1273,12 @@ void ClipItem::resizeStart(int posx, bool /*size*/, bool emitChange)
             m_startThumbTimer.start(150);
         }
     }
-    if (m_isMainSelectedClip && emitChange) emit updateRange();
+    if (emitChange) slotUpdateRange();
+}
+
+void ClipItem::slotUpdateRange()
+{
+    if (m_isMainSelectedClip) emit updateRange();
 }
 
 void ClipItem::resizeEnd(int posx, bool emitChange)
@@ -1295,7 +1300,7 @@ void ClipItem::resizeEnd(int posx, bool emitChange)
             m_endThumbTimer.start(150);
         }
     }
-    if (m_isMainSelectedClip && emitChange) emit updateRange();
+    if (emitChange) slotUpdateRange();
 }
 
 //virtual
index 7aea4d8113c55b8164d999c076fb4d2ffe6f8c34..74e9255a085096788553f3baf8e70597c6551ca7 100644 (file)
@@ -255,6 +255,7 @@ public slots:
     void slotFetchThumbs();
     void slotSetStartThumb(const QPixmap pix);
     void slotSetEndThumb(const QPixmap pix);
+    void slotUpdateRange();
 
 signals:
     void prepareAudioThumb(double, int, int, int);
index 2c211f1c9d2abbe3d6996405348c820ebdcc480e..fbb9a020ec186c2d4d9e4413c1afc9ffacceb484 100644 (file)
@@ -3936,6 +3936,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
             }
         } else {
             prepareResizeClipStart(m_dragItem, m_dragItemInfo, m_dragItem->startPos().frames(m_document->fps()));
+           if (m_dragItem->type() == AVWIDGET) static_cast <ClipItem*>(m_dragItem)->slotUpdateRange();
         }
     } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) {
         // resize end
@@ -3961,6 +3962,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
             }
         } else {
             prepareResizeClipEnd(m_dragItem, m_dragItemInfo, m_dragItem->endPos().frames(m_document->fps()));
+           if (m_dragItem->type() == AVWIDGET) static_cast <ClipItem*>(m_dragItem)->slotUpdateRange();
         }
     } else if (m_operationMode == FADEIN) {
         // resize fade in effect
index 97b2fcf71fb0eb64621edb9d827e56696a9f711b..937ab746da17bada78eecbf28c8621bd27dadc43 100644 (file)
@@ -816,7 +816,6 @@ void ParameterContainer::slotStartFilterJobAction()
         QDomElement pa = namenode.item(i).toElement();
         QString type = pa.attribute("type");
         if (type == "filterjob") {
-           kDebug()<<"// FILTER POSE: "<<m_geometryWidget->currentPosition();
            QString filterparams = pa.attribute("filterparams");
            if (filterparams.contains("%position")) {
                if (m_geometryWidget) filterparams.replace("%position", QString::number(m_geometryWidget->currentPosition()));
@@ -837,7 +836,6 @@ void ParameterContainer::slotStartFilterJobAction()
                 QDomElement e = jobparams.item(j).toElement();
                extraParams.insert(e.attribute("name"), e.text().toUtf8());
            }
-           kDebug()<<"+++++++++++++++++   CLIP IN: "<<m_in;
            extraParams.insert("offset", QString::number(m_in));
             emit startFilterJob(pa.attribute("filtertag"), filterparams, pa.attribute("consumer"), pa.attribute("consumerparams"), extraParams);
             kDebug()<<" - - -PROPS:\n"<<pa.attribute("filtertag")<<"-"<< filterparams<<"-"<< pa.attribute("consumer")<<"-"<< pa.attribute("consumerparams")<<"-"<< pa.attribute("extraparams");