m_dragItem = (ClipItem *) item;
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) m_startPos = QPointF(m_dragItem->startPos(), m_dragItem->track());
- else if (m_operationMode == RESIZEEND) m_startPos = QPointF(m_dragItem->endPos(), m_dragItem->track());
+ if (m_operationMode == MOVE || m_operationMode == RESIZESTART)
+ m_startPos = QPointF(m_dragItem->startPos(), m_dragItem->track());
+ else if (m_operationMode == RESIZEEND)
+ m_startPos = QPointF(m_dragItem->endPos(), m_dragItem->track());
kDebug()<<"//////// ITEM CLICKED: "<<m_startPos;
collision = true;
break;
void CustomTrackView::dragEnterEvent ( QDragEnterEvent * event )
{
if (event->mimeData()->hasText()) {
- QString clip = event->mimeData()->text();
+ kDebug()<<"/////////////// DRAG ENTERED, TEXT: "<<event->mimeData()->text();
+ QStringList ids = QString(event->mimeData()->text()).split(";");
+ //TODO: drop of several clips
+ for (int i = 0; i < ids.size(); ++i) {
+ }
+ DocClipBase *clip = m_document->getBaseClip(ids.at(0).toInt());
+ if (clip == NULL) kDebug()<<" WARNING))))))))) CLIP NOT FOUND : "<<ids.at(0).toInt();
addItem(clip, event->pos());
event->acceptProposedAction();
}
}
-
-void CustomTrackView::addItem(QString producer, QPoint pos)
+void CustomTrackView::addItem(DocClipBase *clip, QPoint pos)
{
- QDomDocument doc;
- doc.setContent(producer);
- QDomElement elem = doc.documentElement();
- int in = elem.attribute("in", 0).toInt();
- int out = elem.attribute("out", 0).toInt() - in;
- if (out == 0) out = elem.attribute("duration", 0).toInt();
- kDebug()<<"ADDING CLIP: "<<producer<<", OUT: "<<out<<", POS: "<<mapToScene(pos);
+ int in =0;
+ int out = clip->duration().frames(m_document->fps());
+ //kdDebug()<<"- - - -CREATING CLIP, duration = "<<out<<", URL: "<<clip->fileURL();
int trackTop = ((int) mapToScene(pos).y()/50) * 50 + 1;
- m_dropItem = new ClipItem(elem, ((int) mapToScene(pos).y()/50), in, QRectF(mapToScene(pos).x() * m_scale, trackTop, out * m_scale, 49), out);
+ m_dropItem = new ClipItem(clip, ((int) mapToScene(pos).y()/50), in, QRectF(mapToScene(pos).x() * m_scale, trackTop, out * m_scale, 49), out);
scene()->addItem(m_dropItem);
}
void CustomTrackView::dropEvent ( QDropEvent * event ) {
if (m_dropItem) {
- AddTimelineClipCommand *command = new AddTimelineClipCommand(this, m_dropItem->xml(), m_dropItem->track(), m_dropItem->startPos(), m_dropItem->rect(), m_dropItem->duration(), false);
+ AddTimelineClipCommand *command = new AddTimelineClipCommand(this, m_dropItem->xml(), m_dropItem->clipProducer(), m_dropItem->track(), m_dropItem->startPos(), m_dropItem->rect(), m_dropItem->duration(), false);
m_commandStack->push(command);
- m_document->renderer()->mltInsertClip(m_dropItem->track(), GenTime(m_dropItem->startPos(), 25), m_dropItem->xml());
+ 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_dropItem = NULL;
}
m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), 50 * m_tracksCount);
}
-void CustomTrackView::setCursorPos(int pos)
+void CustomTrackView::setCursorPos(int pos, bool seek)
{
m_cursorPos = pos;
m_cursorLine->setPos(pos, 0);
int frame = mapToScene(QPoint(pos, 0)).x() / m_scale;
- m_document->renderer()->seek(GenTime(frame, 25));
+ if (seek) m_document->renderer()->seek(GenTime(frame, 25));
}
int CustomTrackView::cursorPos()
// move clip
MoveClipCommand *command = new MoveClipCommand(this, m_startPos, QPointF(m_dragItem->startPos(), m_dragItem->track()), false);
m_commandStack->push(command);
+ m_document->renderer()->mltMoveClip(m_tracksCount - m_startPos.y(), m_tracksCount - m_dragItem->track(), m_startPos.x(), m_dragItem->startPos());
}
else if (m_operationMode == RESIZESTART) {
// 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_commandStack->push(command);
}
else if (m_operationMode == RESIZEEND) {
// 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_commandStack->push(command);
}
m_operationMode = NONE;
m_dragItem = NULL;
}
-void CustomTrackView::deleteClip ( const QRectF &rect )
+void CustomTrackView::deleteClip (int track, int startpos, const QRectF &rect )
{
ClipItem *item = (ClipItem *) scene()->itemAt(rect.x() + 1, rect.y() + 1);
if (!item) {
kDebug()<<"---------------- ERROR, CANNOT find clip to move at: "<<rect.x();
return;
}
+ item->baseClip()->removeReference();
+ m_document->updateClip(item->baseClip()->getId());
delete item;
+ m_document->renderer()->mltRemoveClip(m_tracksCount - track, GenTime(startpos, 25));
}
-void CustomTrackView::addClip ( QDomElement xml, int track, int startpos, const QRectF &rect, int duration )
+void CustomTrackView::addClip ( QDomElement xml, int clipId, int track, int startpos, const QRectF &rect, int duration )
{
QRect r(startpos * m_scale, 50 * track, duration * m_scale, 49);
- ClipItem *item = new ClipItem(xml, track, startpos, r, duration);
+ DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId);
+ ClipItem *item = new ClipItem(baseclip, track, startpos, r, duration);
scene()->addItem(item);
+ baseclip->addReference();
+ m_document->updateClip(baseclip->getId());
+ m_document->renderer()->mltInsertClip(m_tracksCount - track, GenTime(startpos, 25), xml);
}
void CustomTrackView::moveClip ( const QPointF &startPos, const QPointF &endPos )
}
kDebug()<<"---------------- Move CLIP FROM: "<<startPos.x()<<", END:"<<endPos.x();
item->moveTo(endPos.x(), m_scale, (endPos.y() - startPos.y()) * 50, endPos.y());
+ m_document->renderer()->mltMoveClip(m_tracksCount - startPos.y(), m_tracksCount - endPos.y(), startPos.x(), endPos.x());
}
void CustomTrackView::resizeClip ( const QPointF &startPos, const QPointF &endPos, bool resizeClipStart )
}
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));
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));
item->resizeEnd(endPos.x(), m_scale);
}
}
void CustomTrackView::drawBackground ( QPainter * painter, const QRectF & rect )
{
QColor base = palette().button().color();
- painter->setPen(base);
+ //painter->setPen(base);
painter->setClipRect(rect);
painter->drawLine(0, 0, rect.width(), 0);
for (uint i = 0; i < m_tracksCount;i++)
{
- 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));
+ 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;
if (height() > lowerLimit)
projects / kdenlive / blobdiff