text changes in other editor too

[kdenlive] / src / customtrackview.cpp

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index bab54b1cb04585f87c3a046e96156ecf3b83c226..86cf16b610918b44c9b4709bd38905b0d20063a5 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -266,17 +266,32 @@ void CustomTrackView::mousePressEvent ( QMouseEvent * event )
 {
   kDebug()<<"-- TIMELINE MSE PRESSED";
   int pos = event->x();
-  if (event->modifiers() == Qt::ControlModifier) 
+  if (event->modifiers() == Qt::ControlModifier) {
     setDragMode(QGraphicsView::ScrollHandDrag);
-  else if (event->modifiers() == Qt::ShiftModifier) 
+    QGraphicsView::mousePressEvent(event);
+    return;
+  }
+  else if (event->modifiers() == Qt::ShiftModifier) {
     setDragMode(QGraphicsView::RubberBandDrag);
+    QGraphicsView::mousePressEvent(event);
+    return;
+  }
   else {
     bool collision = false;
     QList<QGraphicsItem *> collisionList = items(event->pos());
     for (int i = 0; i < collisionList.size(); ++i) {
       QGraphicsItem *item = collisionList.at(i);
       if (item->type() == 70000) {
+       // select item
+       if (!item->isSelected()) {
+         QList<QGraphicsItem *> itemList = items();
+         for (int i = 0; i < itemList.count(); i++)
+           itemList.at(i)->setSelected(false);
+         item->setSelected(true);
+         update();
+       }
        m_dragItem = (ClipItem *) item;
+       emit clipItemSelected(m_dragItem);
        m_clickPoint = mapToScene(event->pos()).x() - m_dragItem->startPos() * m_scale;
        m_operationMode = m_dragItem->operationMode(item->mapFromScene(mapToScene(event->pos())), m_scale);
        if (m_operationMode == MOVE || m_operationMode == RESIZESTART) 
@@ -292,13 +307,17 @@ void CustomTrackView::mousePressEvent ( QMouseEvent * event )
       kDebug()<<"//////// NO ITEM FOUND ON CLICK";
       m_dragItem = NULL;
       setCursor(Qt::ArrowCursor);
+      QList<QGraphicsItem *> itemList = items();
+      for (int i = 0; i < itemList.count(); i++)
+       itemList.at(i)->setSelected(false);
+      emit clipItemSelected(NULL);
       setCursorPos((int) mapToScene(event->x(), 0).x());
       emit cursorMoved(cursorPos());
     }
   }
   updateSnapPoints(m_dragItem);
   //kDebug()<<pos;
-  QGraphicsView::mousePressEvent(event);
+  //QGraphicsView::mousePressEvent(event);
 }
 
 void CustomTrackView::dragEnterEvent ( QDragEnterEvent * event )
@@ -316,29 +335,67 @@ void CustomTrackView::dragEnterEvent ( QDragEnterEvent * event )
   }
 }
 
-void CustomTrackView::addEffect(int track, GenTime pos, QString tag, QMap <QString, QString> args)
+void CustomTrackView::slotRefreshEffects(ClipItem *clip)
 {
-  m_document->renderer()->mltAddEffect(track, pos, tag, args);  
+  int track = m_tracksCount - clip->track();
+  GenTime pos = GenTime(clip->startPos(), m_document->fps());
+  m_document->renderer()->mltRemoveEffect(track, pos, "-1", false);
+  for (int i = 0; i < clip->effectsCount(); i++) {
+    m_document->renderer()->mltAddEffect(track, pos, clip->getEffectArgs(clip->effectAt(i)), false);
+  }
+  m_document->renderer()->doRefresh();
+}
+
+void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect)
+{
+  ClipItem *clip = getClipItemAt(pos.frames(m_document->fps()) + 1, m_tracksCount - track);
+  if (clip){ 
+    QMap <QString, QString> effectParams = clip->addEffect(effect);
+    m_document->renderer()->mltAddEffect(track, pos, effectParams);
+    emit clipItemSelected(clip);
+  }
 }
 
-void CustomTrackView::deleteEffect(int track, GenTime pos, QString tag)
+void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect)
 {
-  m_document->renderer()->mltRemoveEffect(track, pos, tag, -1);  
+  QString index = effect.attribute("kdenlive_ix");
+  m_document->renderer()->mltRemoveEffect(track, pos, index);  
+  ClipItem *clip = getClipItemAt(pos.frames(m_document->fps()) + 1, m_tracksCount - track);
+       if (clip){
+               clip->deleteEffect(index);
+               emit clipItemSelected(clip);
+       }
 }
 
-void CustomTrackView::slotAddEffect(QMap <QString, QString> filter)
+void CustomTrackView::slotAddEffect(QDomElement effect)
 {
   QList<QGraphicsItem *> itemList = items();
   for (int i = 0; i < itemList.count(); i++) {
     if (itemList.at(i)->type() == 70000 && itemList.at(i)->isSelected()) {
       ClipItem *item = (ClipItem *)itemList.at(i);
-      QString tag = filter.value("mlt_service");
-      AddEffectCommand *command = new AddEffectCommand(this, m_tracksCount - item->track(),GenTime(item->startPos(), 25), tag, filter, true);
+      // the kdenlive_ix int is used to identify an effect in mlt's playlist, should
+      // not be changed
+      effect.setAttribute("kdenlive_ix", QString::number(item->effectsCounter()));
+      AddEffectCommand *command = new AddEffectCommand(this, m_tracksCount - item->track(),GenTime(item->startPos(), m_document->fps()), effect, true);
       m_commandStack->push(command);    
     }
   }
 }
 
+void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect)
+{
+  AddEffectCommand *command = new AddEffectCommand(this, m_tracksCount - clip->track(), GenTime(clip->startPos(), m_document->fps()), effect, false);
+  m_commandStack->push(command);
+}
+
+
+void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement effect)
+{
+    QMap <QString, QString> effectParams = clip->getEffectArgs(effect);
+    m_document->renderer()->mltEditEffect(m_tracksCount - clip->track(), GenTime(clip->startPos(), m_document->fps()), effectParams);
+}
+
+
 void CustomTrackView::addItem(DocClipBase *clip, QPoint pos)
 {
   int in =0;
@@ -379,7 +436,7 @@ void CustomTrackView::dropEvent ( QDropEvent * event ) {
     m_dropItem->baseClip()->addReference();
     m_document->updateClip(m_dropItem->baseClip()->getId());
     kDebug()<<"IIIIIIIIIIIIIIIIIIIIIIII TRAX CNT: "<<m_tracksCount<<", DROP: "<<m_dropItem->track();
-    m_document->renderer()->mltInsertClip(m_tracksCount - m_dropItem->track(), GenTime(m_dropItem->startPos(), 25), m_dropItem->xml());
+    m_document->renderer()->mltInsertClip(m_tracksCount - m_dropItem->track(), GenTime(m_dropItem->startPos(), m_document->fps()), m_dropItem->xml());
   }
   m_dropItem = NULL;
 }
@@ -403,7 +460,7 @@ void CustomTrackView::setDuration(int duration)
 {
   kDebug()<<"/////////////  PRO DUR: "<<duration<<", height: "<<50 * m_tracksCount;
   m_projectDuration = duration;
-  scene()->setSceneRect(0, 0, m_projectDuration + 500, scene()->sceneRect().height()); //50 * m_tracksCount);
+  scene()->setSceneRect(0, 0, (m_projectDuration + 500) * m_scale, scene()->sceneRect().height()); //50 * m_tracksCount);
 }
 
 
@@ -442,7 +499,7 @@ void CustomTrackView::setCursorPos(int pos, bool seek)
   m_cursorPos = pos;
   m_cursorLine->setPos(pos, 0);
   int frame = mapToScene(QPoint(pos, 0)).x() / m_scale;
-  if (seek) m_document->renderer()->seek(GenTime(frame, 25));
+  if (seek) m_document->renderer()->seek(GenTime(frame, m_document->fps()));
 }
 
 int CustomTrackView::cursorPos()
@@ -456,7 +513,7 @@ void CustomTrackView::mouseReleaseEvent ( QMouseEvent * event )
   setDragMode(QGraphicsView::NoDrag);
   if (m_dragItem == NULL) return;
   //kDebug()<<"/// MOVING CLIP: "<<m_startPos<<", END: "<<QPoint(m_dragItem->rect().x(),m_dragItem->rect().y());
-  if (m_operationMode == MOVE) {
+  if (m_operationMode == MOVE && m_startPos.x() != m_dragItem->startPos()) {
     // move clip
     MoveClipCommand *command = new MoveClipCommand(this, m_startPos, QPointF(m_dragItem->startPos(), m_dragItem->track()), false);
     m_commandStack->push(command);
@@ -466,7 +523,7 @@ void CustomTrackView::mouseReleaseEvent ( QMouseEvent * event )
     // resize start
     ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->startPos(), m_dragItem->track()), true, false);
 
-    m_document->renderer()->mltResizeClipStart(m_tracksCount - m_dragItem->track(), GenTime(m_dragItem->endPos(), 25), GenTime(m_dragItem->startPos(), 25), GenTime(m_startPos.x(), 25), GenTime(m_dragItem->cropStart(), 25), GenTime(m_dragItem->cropStart(), 25) + GenTime(m_dragItem->endPos(), 25) - GenTime(m_dragItem->startPos(), 25));
+    m_document->renderer()->mltResizeClipStart(m_tracksCount - m_dragItem->track(), GenTime(m_dragItem->endPos(), m_document->fps()), GenTime(m_dragItem->startPos(), m_document->fps()), GenTime(m_startPos.x(), m_document->fps()), GenTime(m_dragItem->cropStart(), m_document->fps()), GenTime(m_dragItem->cropStart(), m_document->fps()) + GenTime(m_dragItem->endPos(), m_document->fps()) - GenTime(m_dragItem->startPos(), m_document->fps()));
     m_commandStack->push(command);
     m_document->renderer()->doRefresh();
   }
@@ -474,7 +531,7 @@ void CustomTrackView::mouseReleaseEvent ( QMouseEvent * event )
     // resize end
     ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->endPos(), m_dragItem->track()), false, false);
 
-    m_document->renderer()->mltResizeClipEnd(m_tracksCount - m_dragItem->track(), GenTime(m_dragItem->startPos(), 25), GenTime(m_dragItem->cropStart(), 25), GenTime(m_dragItem->cropStart(), 25) + GenTime(m_dragItem->endPos(), 25) - GenTime(m_dragItem->startPos(), 25));
+    m_document->renderer()->mltResizeClipEnd(m_tracksCount - m_dragItem->track(), GenTime(m_dragItem->startPos(), m_document->fps()), GenTime(m_dragItem->cropStart(), m_document->fps()), GenTime(m_dragItem->cropStart(), m_document->fps()) + GenTime(m_dragItem->endPos(), m_document->fps()) - GenTime(m_dragItem->startPos(), m_document->fps()));
     m_commandStack->push(command);
     m_document->renderer()->doRefresh();
   }
@@ -484,7 +541,7 @@ void CustomTrackView::mouseReleaseEvent ( QMouseEvent * event )
 
 void CustomTrackView::deleteClip (int track, int startpos, const QRectF &rect )
 {
-  ClipItem *item = (ClipItem *) scene()->itemAt(rect.x() + 1, rect.y() + 1);
+  ClipItem *item = getClipItemAt(startpos, track);
   if (!item) {
     kDebug()<<"----------------  ERROR, CANNOT find clip to move at: "<<rect.x();
     return;
@@ -492,7 +549,7 @@ void CustomTrackView::deleteClip (int track, int startpos, const QRectF &rect )
   item->baseClip()->removeReference();
   m_document->updateClip(item->baseClip()->getId());
   delete item;
-  m_document->renderer()->mltRemoveClip(m_tracksCount - track, GenTime(startpos, 25));
+  m_document->renderer()->mltRemoveClip(m_tracksCount - track, GenTime(startpos, m_document->fps()));
   m_document->renderer()->doRefresh();
 }
 
@@ -504,13 +561,18 @@ void CustomTrackView::addClip ( QDomElement xml, int clipId, int track, int star
   scene()->addItem(item);
   baseclip->addReference();
   m_document->updateClip(baseclip->getId());
-  m_document->renderer()->mltInsertClip(m_tracksCount - track, GenTime(startpos, 25), xml);
+  m_document->renderer()->mltInsertClip(m_tracksCount - track, GenTime(startpos, m_document->fps()), xml);
   m_document->renderer()->doRefresh();
 }
 
+ClipItem *CustomTrackView::getClipItemAt(int pos, int track)
+{
+  return (ClipItem *) scene()->itemAt(pos * m_scale, track * 50 + 25);
+}
+
 void CustomTrackView::moveClip ( const QPointF &startPos, const QPointF &endPos )
 {
-  ClipItem *item = (ClipItem *) scene()->itemAt((startPos.x() + 1) * m_scale, startPos.y() * 50 + 25);
+  ClipItem *item = getClipItemAt(startPos.x() + 1, startPos.y());
   if (!item) {
     kDebug()<<"----------------  ERROR, CANNOT find clip to move at: "<<startPos.x() * m_scale * FRAME_SIZE + 1<<", "<<startPos.y() * 50 + 25;
     return;
@@ -525,18 +587,18 @@ void CustomTrackView::resizeClip ( const QPointF &startPos, const QPointF &endPo
   int offset;
   if (resizeClipStart) offset = 1;
   else offset = -1;
-  ClipItem *item = (ClipItem *) scene()->itemAt((startPos.x() + offset) * m_scale, startPos.y() * 50 + 25);
+  ClipItem *item = getClipItemAt(startPos.x() + offset, startPos.y());
   if (!item) {
     kDebug()<<"----------------  ERROR, CANNOT find clip to resize at: "<<startPos;
     return;
   }
   qreal diff = endPos.x() - startPos.x();
   if (resizeClipStart) {
-    m_document->renderer()->mltResizeClipStart(m_tracksCount - item->track(), GenTime(item->endPos(), 25), GenTime(endPos.x(), 25), GenTime(item->startPos(), 25), GenTime(item->cropStart() + diff, 25), GenTime(item->cropStart() + diff, 25) + GenTime(item->endPos(), 25) - GenTime(endPos.x(), 25));
+    m_document->renderer()->mltResizeClipStart(m_tracksCount - item->track(), GenTime(item->endPos(), m_document->fps()), GenTime(endPos.x(), m_document->fps()), GenTime(item->startPos(), m_document->fps()), GenTime(item->cropStart() + diff, m_document->fps()), GenTime(item->cropStart() + diff, m_document->fps()) + GenTime(item->endPos(), m_document->fps()) - GenTime(endPos.x(), m_document->fps()));
     item->resizeStart(endPos.x(), m_scale);
   }
   else {
-    m_document->renderer()->mltResizeClipEnd(m_tracksCount - item->track(), GenTime(item->startPos(), 25), GenTime(item->cropStart(), 25), GenTime(item->cropStart(), 25) + GenTime(endPos.x(), 25) - GenTime(item->startPos(), 25));
+    m_document->renderer()->mltResizeClipEnd(m_tracksCount - item->track(), GenTime(item->startPos(), m_document->fps()), GenTime(item->cropStart(), m_document->fps()), GenTime(item->cropStart(), m_document->fps()) + GenTime(endPos.x(), m_document->fps()) - GenTime(item->startPos(), m_document->fps()));
     item->resizeEnd(endPos.x(), m_scale);
   }
   m_document->renderer()->doRefresh();
@@ -593,6 +655,7 @@ void CustomTrackView::setScale(double scaleFactor)
   m_scale = scaleFactor;
   kDebug()<<" HHHHHHHH  SCALING: "<<m_scale;
   QList<QGraphicsItem *> itemList = items();
+  scene()->setSceneRect(0, 0, (m_projectDuration + 500) * m_scale, scene()->sceneRect().height()); //50 *
 
   for (int i = 0; i < itemList.count(); i++) {
       if (itemList.at(i)->type() == 70000) {
@@ -615,10 +678,11 @@ void CustomTrackView::drawBackground ( QPainter * painter, const QRectF & rect )
   QColor base = palette().button().color();
   //painter->setPen(base);
   painter->setClipRect(rect);
-  painter->drawLine(0, 0, rect.width(), 0);
+  int width = scene()->sceneRect().width();
+  painter->drawLine(0, 0, width, 0);
     for (uint i = 0; i < m_tracksCount;i++)
     {
-      painter->drawLine(0, 50 * (i+1), width(), 50 * (i+1));
+      painter->drawLine(0, 50 * (i+1), width, 50 * (i+1));
       painter->drawText(QRectF(10, 50 * i, 100, 50 * i + 49), Qt::AlignLeft, i18n(" Track ") + QString::number(i + 1));
     }
   int lowerLimit = 50 * m_tracksCount;