Fix undo/redo delete clip

[kdenlive] / src / trackview.cpp

diff --git a/src/trackview.cpp b/src/trackview.cpp
index 77b32b6a37060ca46ae1fca53a89d773fa47d3e7..21d8316919e80d7462cc32c4daaa6607a2ff93c0 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -95,6 +95,7 @@ int TrackView::tracksNumber()
 void TrackView::parseDocument(QDomDocument doc)
 {
   int cursorPos = 0;
+  kDebug()<<"//// DOCUMENT: "<<doc.toString();
   QDomNode props = doc.elementsByTagName("properties").item(0);
   if (!props.isNull()) {
     cursorPos = props.toElement().attribute("timeline_position").toInt();
@@ -120,14 +121,25 @@ void TrackView::parseDocument(QDomDocument doc)
   //m_scrollBox->setGeometry(0, 0, 300 * zoomFactor(), m_scrollArea->height());
 }
 
+void TrackView::slotDeleteClip(int clipId)
+{
+  m_trackview->deleteClip(clipId);
+}
+
 void TrackView::setCursorPos(int pos)
 {
+  emit cursorMoved();
   m_trackview->setCursorPos(pos * m_scale);
 }
 
+void TrackView::moveCursorPos(int pos)
+{
+  m_trackview->setCursorPos(pos * m_scale, false);
+  //m_ruler->slotNewValue(pos * FRAME_SIZE, false);
+}
+
 void TrackView::slotCursorMoved(int pos, bool emitSignal)
 {
-  kDebug()<<"///// CURSOR: "<<pos;
   m_ruler->slotNewValue(pos * FRAME_SIZE / m_scale, emitSignal); //(int) m_trackview->mapToScene(QPoint(pos, 0)).x());
   //m_trackview->setCursorPos(pos);
   //m_trackview->invalidateScene(QRectF(), QGraphicsScene::ForegroundLayer);
@@ -197,9 +209,11 @@ int TrackView::slotAddVideoTrack(int ix, QDomElement xml)
     }
     else if (elem.tagName() == "entry") {
     int in = elem.attribute("in", 0).toInt();
+    int id = elem.attribute("producer", 0).toInt();
+    DocClipBase *clip = m_doc->clipManager()->getClipById(id);
     int out = elem.attribute("out", 0).toInt() - in;
     //kDebug()<<"++++++++++++++\n\n / / /ADDING CLIP: "<<clip.cropTime<<", out: "<<clip.duration<<", Producer: "<<clip.producer<<"\n\n++++++++++++++++++++";
-    ClipItem *item = new ClipItem(elem, ix, position, QRectF(position * m_scale, trackTop + 1, out * m_scale, 49), out);
+    ClipItem *item = new ClipItem(clip, ix, position, QRectF(position * m_scale, trackTop + 1, out * m_scale, 49), out);
     m_scene->addItem(item);
     position += out;