#include <QGraphicsItem>
#include <QDomDocument>
#include <QScrollBar>
+#include <QApplication>
+#include <QInputDialog>
#include <KDebug>
#include <KLocale>
#include <KUrl>
+#include <KIcon>
#include <KCursor>
#include "customtrackview.h"
#include "addtimelineclipcommand.h"
#include "addeffectcommand.h"
#include "editeffectcommand.h"
+#include "moveeffectcommand.h"
#include "addtransitioncommand.h"
#include "edittransitioncommand.h"
+#include "addmarkercommand.h"
+#include "razorclipcommand.h"
#include "kdenlivesettings.h"
#include "transition.h"
#include "clipitem.h"
#include "customtrackview.h"
#include "clipmanager.h"
#include "renderer.h"
+#include "markerdialog.h"
+#include "mainwindow.h"
+
+
//TODO:
// disable animation if user asked it in KDE's global settings
// http://lists.kde.org/?l=kde-commits&m=120398724717624&w=2
// const int duration = animate ? 1500 : 1;
CustomTrackView::CustomTrackView(KdenliveDoc *doc, QGraphicsScene * projectscene, QWidget *parent)
- : QGraphicsView(projectscene, parent), m_cursorPos(0), m_dropItem(NULL), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_scale(1.0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()) {
+ : QGraphicsView(projectscene, parent), m_cursorPos(0), m_dropItem(NULL), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_scale(1.0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL) {
if (doc) m_commandStack = doc->commandStack();
else m_commandStack == NULL;
setMouseTracking(true);
m_cursorLine->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIgnoresTransformations);
m_cursorLine->setZValue(1000);
}
+
+ KIcon razorIcon("edit-cut");
+ m_razorCursor = QCursor(razorIcon.pixmap(22, 22));
}
void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition) {
int CustomTrackView::getPreviousVideoTrack(int track) {
track = m_tracksList.count() - track - 1;
- int videoTracksCount = 0;
track --;
for (int i = track; i > -1; i--) {
if (m_tracksList.at(i).type == VIDEOTRACK) return i + 1;
setDragMode(QGraphicsView::RubberBandDrag);
else*/
{
-
- if (m_dragItem) { //event->button() == Qt::LeftButton) {
+ if (m_dragItem && m_tool == SELECTTOOL) { //event->button() == Qt::LeftButton) {
// a button was pressed, delete visual tips
- if (m_operationMode == MOVE) {
+ if (m_operationMode == MOVE && (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance()) {
double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x() - m_clickPoint.x());
//kDebug() << "/////// MOVE CLIP, EVENT Y: "<<m_clickPoint.y();//<<event->scenePos().y()<<", SCENE HEIGHT: "<<scene()->sceneRect().height();
- int moveTrack = (int) mapToScene(event->pos() + QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ? m_tracksHeight - m_clickPoint.y() : 0))).y() / m_tracksHeight;
+ int moveTrack = (int) mapToScene(event->pos() + QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ?/* m_tracksHeight*/ - m_clickPoint.y() : 0))).y() / m_tracksHeight;
int currentTrack = m_dragItem->track();
- if (moveTrack > m_tracksList.count() - 1) moveTrack = m_tracksList.count() - 1;
+ if (moveTrack > 1000)moveTrack = 0;
+ else if (moveTrack > m_tracksList.count() - 1) moveTrack = m_tracksList.count() - 1;
else if (moveTrack < 0) moveTrack = 0;
int offset = moveTrack - currentTrack;
m_dragItem->resizeEnd((int)(snappedPos / m_scale), m_scale);
} else if (m_operationMode == FADEIN) {
int pos = (int)(mapToScene(event->pos()).x() / m_scale);
- m_dragItem->setFadeIn((int)(pos - m_dragItem->startPos().frames(m_document->fps())), m_scale);
+ ((ClipItem*) m_dragItem)->setFadeIn((int)(pos - m_dragItem->startPos().frames(m_document->fps())), m_scale);
} else if (m_operationMode == FADEOUT) {
int pos = (int)(mapToScene(event->pos()).x() / m_scale);
- m_dragItem->setFadeOut((int)(m_dragItem->endPos().frames(m_document->fps()) - pos), m_scale);
+ ((ClipItem*) m_dragItem)->setFadeOut((int)(m_dragItem->endPos().frames(m_document->fps()) - pos), m_scale);
}
if (m_animation) delete m_animation;
break;
}
}
+ if (m_tool == RAZORTOOL) {
+ setCursor(m_razorCursor);
+ QGraphicsView::mouseMoveEvent(event);
+ return;
+ }
+
if (item && event->buttons() == Qt::NoButton) {
AbstractClipItem *clip = (AbstractClipItem*) item;
OPERATIONTYPE opMode = opMode = clip->operationMode(mapToScene(event->pos()), m_scale);
}
} else if (opMode == FADEIN) {
if (m_visualTip == NULL) {
- m_visualTip = new QGraphicsEllipseItem(clip->rect().x() + clip->fadeIn() * m_scale - size, clip->rect().y() - 8, size * 2, 16);
+ ClipItem *item = (ClipItem *) clip;
+ m_visualTip = new QGraphicsEllipseItem(item->rect().x() + item->fadeIn() * m_scale - size, item->rect().y() - 8, size * 2, 16);
((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
m_visualTip->setZValue(100);
m_visualTip->setPos(0, 0);
double scale = 2.0;
m_animation->setScaleAt(.5, scale, scale);
- m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale - clip->fadeIn() * m_scale, clip->rect().y() - clip->rect().y() * scale));
+ m_animation->setPosAt(.5, QPointF(item->rect().x() - item->rect().x() * scale - item->fadeIn() * m_scale, item->rect().y() - item->rect().y() * scale));
scale = 1.0;
m_animation->setScaleAt(1, scale, scale);
- m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, clip->rect().y() - clip->rect().y() * scale));
+ m_animation->setPosAt(1, QPointF(item->rect().x() - item->rect().x() * scale, item->rect().y() - item->rect().y() * scale));
scene()->addItem(m_visualTip);
m_animationTimer->start();
}
setCursor(Qt::PointingHandCursor);
} else if (opMode == FADEOUT) {
if (m_visualTip == NULL) {
- m_visualTip = new QGraphicsEllipseItem(clip->rect().x() + clip->rect().width() - clip->fadeOut() * m_scale - size, clip->rect().y() - 8, size*2, 16);
+ ClipItem *item = (ClipItem *) clip;
+ m_visualTip = new QGraphicsEllipseItem(item->rect().x() + item->rect().width() - item->fadeOut() * m_scale - size, item->rect().y() - 8, size*2, 16);
((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
m_visualTip->setZValue(100);
m_visualTip->setPos(0, 0);
double scale = 2.0;
m_animation->setScaleAt(.5, scale, scale);
- m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale - clip->rect().width() + clip->fadeOut() * m_scale, clip->rect().y() - clip->rect().y() * scale));
+ m_animation->setPosAt(.5, QPointF(item->rect().x() - item->rect().x() * scale - item->rect().width() + item->fadeOut() * m_scale, item->rect().y() - item->rect().y() * scale));
scale = 1.0;
m_animation->setScaleAt(1, scale, scale);
- m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, clip->rect().y() - clip->rect().y() * scale));
+ m_animation->setPosAt(1, QPointF(item->rect().x() - item->rect().x() * scale, item->rect().y() - item->rect().y() * scale));
scene()->addItem(m_visualTip);
m_animationTimer->start();
}
m_animation = new QGraphicsItemAnimation;
m_animation->setItem(m_visualTip);
m_animation->setTimeLine(m_animationTimer);
- m_visualTip->setPos(clip->rect().x() + 15, clip->rect().y() + clip->rect().height() / 2);
+ m_visualTip->setPos(clip->rect().x() + 10, clip->rect().y() + clip->rect().height() / 2 + 12);
double scale = 2.0;
m_animation->setScaleAt(.5, scale, scale);
scale = 1.0;
m_animation = new QGraphicsItemAnimation;
m_animation->setItem(m_visualTip);
m_animation->setTimeLine(m_animationTimer);
- m_visualTip->setPos(clip->rect().x() + clip->rect().width() - 15 , clip->rect().y() + clip->rect().height() / 2);
+ m_visualTip->setPos(clip->rect().x() + clip->rect().width() - 10 , clip->rect().y() + clip->rect().height() / 2 + 12);
double scale = 2.0;
m_animation->setScaleAt(.5, scale, scale);
scale = 1.0;
// virtual
void CustomTrackView::mousePressEvent(QMouseEvent * event) {
activateMonitor();
- int pos = event->x();
+ m_clickEvent = event->pos();
+ if (event->button() == Qt::MidButton) {
+ m_document->renderer()->switchPlay();
+ return;
+ }
if (event->modifiers() == Qt::ControlModifier) {
setDragMode(QGraphicsView::ScrollHandDrag);
QGraphicsView::mousePressEvent(event);
for (int i = 0; i < collisionList.size(); ++i) {
QGraphicsItem *item = collisionList.at(i);
if (item->type() == AVWIDGET || item->type() == TRANSITIONWIDGET) {
+ if (m_tool == RAZORTOOL) {
+ if (item->type() == TRANSITIONWIDGET) return;
+ AbstractClipItem *clip = (AbstractClipItem *) item;
+ ItemInfo info;
+ info.startPos = clip->startPos();
+ info.endPos = clip->endPos();
+ info.track = clip->track();
+ RazorClipCommand* command = new RazorClipCommand(this, info, GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()), true);
+ m_commandStack->push(command);
+ m_document->setModified(true);
+ return;
+ }
// select item
if (!item->isSelected()) {
QList<QGraphicsItem *> itemList = items();
info.endPos = m_dragItem->endPos();
info.startPos = info.endPos - GenTime(2.5);
info.track = m_dragItem->track();
- int transitiontrack = info.track - 1;
+ int transitiontrack = getPreviousVideoTrack(info.track);
slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack);
}
updateSnapPoints(m_dragItem);
}
}
emit clipItemSelected((m_dragItem && m_dragItem->type() == AVWIDGET) ? (ClipItem*) m_dragItem : NULL);
- emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? (Transition*) m_dragItem : NULL);
if (!collision) {
kDebug() << "//////// NO ITEM FOUND ON CLICK";
} else setCursorPos((int)(mapToScene(event->x(), 0).x() / m_scale));
} else if (event->button() == Qt::RightButton) {
m_operationMode = NONE;
- displayContextMenu(event->globalPos(), (ClipItem *) m_dragItem);
+ displayContextMenu(event->globalPos(), m_dragItem);
m_dragItem = NULL;
}
}
//QGraphicsView::mousePressEvent(event);
}
-void CustomTrackView::displayContextMenu(QPoint pos, ClipItem *clip) {
- m_timelineContextClipMenu->popup(pos);
+void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip) {
+ if (clip == NULL) m_timelineContextMenu->popup(pos);
+ else if (clip->type() == AVWIDGET) m_timelineContextClipMenu->popup(pos);
+ else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos);
}
void CustomTrackView::activateMonitor() {
void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) {
QList<QGraphicsItem *> itemList;
- if (track == -1)
- itemList = items();
- else {
+ if (track == -1) itemList = scene()->selectedItems();
+ if (itemList.isEmpty()) {
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, track);
if (clip) itemList.append(clip);
else kDebug() << "------ wrning, clip eff not found";
}
- kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track;
+ kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track << "SELECTED ITEMS: " << itemList.count();
for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == AVWIDGET && itemList.at(i)->isSelected()) {
+ if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *)itemList.at(i);
// the kdenlive_ix int is used to identify an effect in mlt's playlist, should
// not be changed
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track);
if (clip) {
QMap <QString, QString> effectParams = clip->getEffectArgs(effect);
- if (effectParams["disabled"] == "1") {
- QString index = effectParams["kdenlive_ix"];
+ if (effectParams.value("disabled") == "1") {
+ QString index = effectParams.value("kdenlive_ix");
m_document->renderer()->mltRemoveEffect(track, pos, index);
} else m_document->renderer()->mltEditEffect(m_tracksList.count() - clip->track(), clip->startPos(), effectParams);
}
m_document->setModified(true);
}
+void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) {
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track);
+ if (clip) {
+ m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos);
+ }
+ m_document->setModified(true);
+}
+
void CustomTrackView::slotChangeEffectState(ClipItem *clip, QDomElement effect, bool disable) {
QDomElement oldEffect = effect.cloneNode().toElement();
effect.setAttribute("disabled", disable);
m_document->setModified(true);
}
+void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos) {
+ MoveEffectCommand *command = new MoveEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), currentPos, newPos, true);
+ m_commandStack->push(command);
+ m_document->setModified(true);
+}
+
void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect) {
EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldeffect, effect, true);
m_commandStack->push(command);
}
+void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) {
+ if (cut) {
+ // cut clip
+ ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
+ int cutPos = (int) cutTime.frames(m_document->fps());
+ ItemInfo newPos;
+ newPos.startPos = cutTime;
+ newPos.endPos = info.endPos;
+ newPos.track = info.track;
+ ClipItem *dup = new ClipItem(item->baseClip(), newPos, item->cropStart(), m_scale, m_document->fps());
+ dup->setCropStart(dup->cropStart() + (cutTime - info.startPos));
+ item->resizeEnd(cutPos, m_scale);
+ scene()->addItem(dup);
+ m_document->renderer()->mltCutClip(m_tracksList.count() - info.track, cutTime);
+ } else {
+ // uncut clip
+ ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
+ ClipItem *dup = getClipItemAt((int) cutTime.frames(m_document->fps()), info.track);
+ delete dup;
+ item->resizeEnd((int) info.endPos.frames(m_document->fps()), m_scale);
+ m_document->renderer()->mltRemoveClip(m_tracksList.count() - info.track, cutTime);
+ m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - info.track, info.startPos, item->cropStart(), item->cropStart() + info.endPos - info.startPos);
+ }
+}
+
+
+void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) {
+ QList<QGraphicsItem *> itemList = scene()->selectedItems();
+ for (int i = 0; i < itemList.count(); i++) {
+ if (itemList.at(i)->type() == AVWIDGET) {
+ ClipItem *item = (ClipItem *) itemList.at(i);
+ ItemInfo info;
+ info.startPos = item->startPos();
+ info.endPos = info.startPos + GenTime(2.5);
+ info.track = item->track();
+ int transitiontrack = getPreviousVideoTrack(info.track);
+ slotAddTransition(item, info, transitiontrack, transition);
+ }
+ }
+}
+
void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QDomElement transition) {
- AddTransitionCommand* command = new AddTransitionCommand(this, transitionInfo, endTrack, transition, true);
+ AddTransitionCommand* command = new AddTransitionCommand(this, transitionInfo, endTrack, transition, false, true);
m_commandStack->push(command);
m_document->setModified(true);
}
Transition *item = getTransitionItemAt((int)transitionInfo.startPos.frames(m_document->fps()) + 1, transitionInfo.track);
m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML());
delete item;
+ emit transitionItemSelected(NULL);
m_document->setModified(true);
}
-void CustomTrackView::slotTransitionUpdated(QDomElement old, QDomElement newEffect) {
- EditTransitionCommand *command = new EditTransitionCommand(this, newEffect.attribute("a_track").toInt(), GenTime(newEffect.attribute("start").toInt(), m_document->fps()) , old, newEffect , true);
+void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) {
+ EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML() , true);
m_commandStack->push(command);
m_document->setModified(true);
}
void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition) {
- m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transitionb_track").toInt(), m_tracksList.count() - transition.attribute("transition_atrack").toInt() ,
- GenTime(transition.attribute("start").toInt(), m_document->renderer()->fps()),
- GenTime(transition.attribute("end").toInt(), m_document->renderer()->fps()),
- transition);
+ Transition *item = getTransitionItemAt((int)pos.frames(m_document->fps()) + 1, track);
+ if (!item) {
+ kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track;
+ return;
+ }
+ m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_tracksList.count() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition);
repaint();
m_document->setModified(true);
}
info.endPos = info.startPos + clip->duration();
info.track = (int)(pos.y() / m_tracksHeight);
//kDebug()<<"------------ ADDING CLIP ITEM----: "<<info.startPos.frames(25)<<", "<<info.endPos.frames(25)<<", "<<info.track;
- m_dropItem = new ClipItem(clip, info, m_scale, m_document->fps());
+ m_dropItem = new ClipItem(clip, info, GenTime(), m_scale, m_document->fps());
scene()->addItem(m_dropItem);
}
event->setDropAction(Qt::IgnoreAction);
kDebug() << "+++++++++++++ DRAG MOVE, : " << mapToScene(event->pos()).x() << ", SCAL: " << m_scale;
if (m_dropItem) {
- int track = (int)(event->pos().y() / m_tracksHeight); //) * (m_scale * 50) + m_scale;
+ int track = (int)(mapToScene(event->pos()).y() / m_tracksHeight); //) * (m_scale * 50) + m_scale;
m_dropItem->moveTo((int)(mapToScene(event->pos()).x() / m_scale), m_scale, (int)((track - m_dropItem->track()) * m_tracksHeight), track);
event->setDropAction(Qt::MoveAction);
if (event->mimeData()->hasFormat("kdenlive/producerslist")) {
return (int)(m_cursorPos * m_scale);
}
+void CustomTrackView::moveCursorPos(int delta) {
+ emit cursorMoved((int)(m_cursorPos * m_scale), (int)((m_cursorPos + delta) * m_scale));
+ m_cursorPos += delta;
+ m_cursorLine->setPos(m_cursorPos * m_scale, 0);
+ m_document->renderer()->seek(GenTime(m_cursorPos, m_document->fps()));
+ //if (m_autoScroll && m_scale < 50) checkScrolling();
+}
+
void CustomTrackView::checkScrolling() {
QRect rectInView = viewport()->rect();
int delta = rectInView.width() / 3;
}
void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
+ if (event->button() == Qt::MidButton) {
+ return;
+ }
QGraphicsView::mouseReleaseEvent(event);
setDragMode(QGraphicsView::NoDrag);
- if (m_dragItem == NULL) return;
+ if (m_dragItem == NULL) {
+ emit transitionItemSelected(NULL);
+ return;
+ }
ItemInfo info;
info.startPos = m_dragItem->startPos();
info.endPos = m_dragItem->endPos();
info.track = m_dragItem->track();
- if (m_operationMode == MOVE) {// && m_startPos.x() != m_dragItem->startPos().frames(m_document->fps())) {
+ if (m_operationMode == MOVE) {
setCursor(Qt::OpenHandCursor);
// move clip
- if (m_dragItem->type() == AVWIDGET) {
+ if (m_dragItem->type() == AVWIDGET && m_dragItemInfo.startPos != info.startPos) {
MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, false);
m_commandStack->push(command);
m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())));
}
- if (m_dragItem->type() == TRANSITIONWIDGET) {
+ if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
m_commandStack->push(command);
//kDebug()<<"/// MOVING TRS FROM: "<<(int)(m_tracksList.count() - m_startPos.y())<<", OFFSET: "<<(int) (m_dragItem->track() - m_startPos.y());
Transition *transition = (Transition *) m_dragItem;
- m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_dragItemInfo.track - m_dragItem->track()), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
+ transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track()));
+ m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
}
} else if (m_operationMode == RESIZESTART) {
// resize start
if (m_dragItem->type() == AVWIDGET) {
m_document->renderer()->mltResizeClipStart(m_tracksList.count() - m_dragItem->track(), m_dragItem->endPos(), m_dragItem->startPos(), m_dragItemInfo.startPos, m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos());
+ updateClipFade((ClipItem *) m_dragItem);
ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false);
m_commandStack->push(command);
} else if (m_dragItem->type() == TRANSITIONWIDGET) {
MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
m_commandStack->push(command);
Transition *transition = (Transition *) m_dragItem;
- m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
+ m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
}
- m_document->renderer()->doRefresh();
+ //m_document->renderer()->doRefresh();
} else if (m_operationMode == RESIZEEND) {
// resize end
if (m_dragItem->type() == AVWIDGET) {
m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - m_dragItem->track(), m_dragItem->startPos(), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos());
m_commandStack->push(command);
} else if (m_dragItem->type() == TRANSITIONWIDGET) {
-
MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
m_commandStack->push(command);
Transition *transition = (Transition *) m_dragItem;
- m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
+ m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
+ }
+ //m_document->renderer()->doRefresh();
+ } else if (m_operationMode == FADEIN) {
+ // resize fade in effect
+ ClipItem * item = (ClipItem *) m_dragItem;
+ QStringList clipeffects = item->effectNames();
+ if (clipeffects.contains(i18n("Fade in"))) {
+ QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade in"));
+ int start = item->cropStart().frames(m_document->fps());
+ int end = item->fadeIn();
+ if (end == 0) {
+ slotDeleteEffect(item, oldeffect);
+ } else {
+ end += start;
+ QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade in");
+ EffectsList::setParameter(effect, "in", QString::number(start));
+ EffectsList::setParameter(effect, "out", QString::number(end));
+ slotUpdateClipEffect(item, oldeffect, effect);
+ }
+ } else if (item->fadeIn() != 0) {
+ QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade in");
+ int start = item->cropStart().frames(m_document->fps());
+ int end = item->fadeIn() + start;
+ EffectsList::setParameter(effect, "in", QString::number(start));
+ EffectsList::setParameter(effect, "out", QString::number(end));
+ slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track());
+ }
+ } else if (m_operationMode == FADEOUT) {
+ // resize fade in effect
+ ClipItem * item = (ClipItem *) m_dragItem;
+ QStringList clipeffects = item->effectNames();
+ if (clipeffects.contains(i18n("Fade out"))) {
+ QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade out"));
+ int end = (item->duration() + item->cropStart()).frames(m_document->fps());
+ int start = item->fadeOut();
+ if (start == 0) {
+ slotDeleteEffect(item, oldeffect);
+ } else {
+ start = end - start;
+ QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade out");
+ EffectsList::setParameter(effect, "in", QString::number(start));
+ EffectsList::setParameter(effect, "out", QString::number(end));
+ slotUpdateClipEffect(item, oldeffect, effect);
+ }
+ } else if (item->fadeOut() != 0) {
+ QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade out");
+ int end = (item->duration() + item->cropStart()).frames(m_document->fps());
+ int start = end - item->fadeOut();
+ EffectsList::setParameter(effect, "in", QString::number(start));
+ EffectsList::setParameter(effect, "out", QString::number(end));
+ slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track());
}
- m_document->renderer()->doRefresh();
}
+
+ emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? (Transition*) m_dragItem : NULL);
m_document->setModified(true);
m_operationMode = NONE;
m_dragItem = NULL;
kDebug() << "---------------- ERROR, CANNOT find clip to move at...";// << rect.x();
return;
}
+ if (item->isSelected()) emit clipItemSelected(NULL);
item->baseClip()->removeReference();
m_document->updateClip(item->baseClip()->getId());
delete item;
}
void CustomTrackView::deleteSelectedClips() {
- QList<QGraphicsItem *> itemList = items();
+ QList<QGraphicsItem *> itemList = scene()->selectedItems();
for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == AVWIDGET && itemList.at(i)->isSelected()) {
+ if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *) itemList.at(i);
ItemInfo info;
info.startPos = item->startPos();
info.track = item->track();
AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), info, true, true);
m_commandStack->push(command);
+ } else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
+ Transition *item = (Transition *) itemList.at(i);
+ ItemInfo info;
+ info.startPos = item->startPos();
+ info.endPos = item->endPos();
+ info.track = item->track();
+ AddTransitionCommand *command = new AddTransitionCommand(this, info, item->transitionEndTrack(), QDomElement(), true, true);
+ m_commandStack->push(command);
+ }
+ }
+}
+
+void CustomTrackView::cutSelectedClips() {
+ QList<QGraphicsItem *> itemList = scene()->selectedItems();
+ GenTime currentPos = GenTime(m_cursorPos, m_document->fps());
+ for (int i = 0; i < itemList.count(); i++) {
+ if (itemList.at(i)->type() == AVWIDGET) {
+ ClipItem *item = (ClipItem *) itemList.at(i);
+ ItemInfo info;
+ info.startPos = item->startPos();
+ info.endPos = item->endPos();
+ if (currentPos > info.startPos && currentPos < info.endPos) {
+ info.track = item->track();
+ RazorClipCommand *command = new RazorClipCommand(this, info, currentPos, true);
+ m_commandStack->push(command);
+ }
}
}
}
void CustomTrackView::addClip(QDomElement xml, int clipId, ItemInfo info) {
DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId);
- ClipItem *item = new ClipItem(baseclip, info, m_scale, m_document->fps());
+ int crop = xml.attribute("in").toInt();
+ ClipItem *item = new ClipItem(baseclip, info, GenTime(crop, m_document->fps()), m_scale, m_document->fps());
scene()->addItem(item);
baseclip->addReference();
m_document->updateClip(baseclip->getId());
m_document->renderer()->doRefresh();
}
+void CustomTrackView::slotUpdateClip(int clipId) {
+ QList<QGraphicsItem *> list = scene()->items();
+ ClipItem *clip = NULL;
+ for (int i = 0; i < list.size(); ++i) {
+ if (list.at(i)->type() == AVWIDGET) {
+ clip = static_cast <ClipItem *>(list.at(i));
+ if (clip->clipProducer() == clipId) {
+ clip->refreshClip();
+ m_document->renderer()->mltUpdateClip(m_tracksList.count() - clip->track(), clip->startPos(), clip->xml());
+ }
+ }
+ }
+}
+
ClipItem *CustomTrackView::getClipItemAt(int pos, int track) {
QList<QGraphicsItem *> list = scene()->items(QPointF(pos * m_scale, track * m_tracksHeight + m_tracksHeight / 2));
ClipItem *clip = NULL;
}
Transition *CustomTrackView::getTransitionItemAt(int pos, int track) {
- QList<QGraphicsItem *> list = scene()->items(QPointF(pos * m_scale, track * m_tracksHeight + m_tracksHeight / 2));
+ QList<QGraphicsItem *> list = scene()->items(QPointF(pos * m_scale, (track + 1) * m_tracksHeight));
Transition *clip = NULL;
for (int i = 0; i < list.size(); ++i) {
if (list.at(i)->type() == TRANSITIONWIDGET) {
item->resizeEnd((int) end.endPos.frames(m_document->fps()), m_scale);
}
//item->moveTransition(GenTime((int) (endPos.x() - startPos.x()), m_document->fps()));
- m_document->renderer()->mltMoveTransition(item->transitionTag(), m_tracksList.count() - start.track, start.track - end.track, start.startPos, start.endPos, end.startPos, end.endPos);
+ item->updateTransitionEndTrack(getPreviousVideoTrack(end.track));
+ m_document->renderer()->mltMoveTransition(item->transitionTag(), m_tracksList.count() - start.track, m_tracksList.count() - end.track, item->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos);
}
void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) {
if (resizeClipStart) {
m_document->renderer()->mltResizeClipStart(m_tracksList.count() - item->track(), item->endPos(), end.startPos, item->startPos(), item->cropStart() + end.startPos - start.startPos, item->cropStart() + end.startPos - start.startPos + item->endPos() - end.startPos);
item->resizeStart((int) end.startPos.frames(m_document->fps()), m_scale);
+ updateClipFade(item);
} else {
m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - item->track(), item->startPos(), item->cropStart(), item->cropStart() + end.startPos - item->startPos());
item->resizeEnd((int) end.startPos.frames(m_document->fps()), m_scale);
+ updateClipFade(item, true);
}
m_document->renderer()->doRefresh();
}
+void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) {
+ if (!updateFadeOut) {
+ int end = item->fadeIn();
+ if (end != 0) {
+ // there is a fade in effect
+ QStringList clipeffects = item->effectNames();
+ QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade in"));
+ int start = item->cropStart().frames(m_document->fps());
+ end += start;
+ EffectsList::setParameter(oldeffect, "in", QString::number(start));
+ EffectsList::setParameter(oldeffect, "out", QString::number(end));
+ QMap <QString, QString> effectParams = item->getEffectArgs(oldeffect);
+ m_document->renderer()->mltEditEffect(m_tracksList.count() - item->track(), item->startPos(), effectParams);
+ }
+ } else {
+ int start = item->fadeOut();
+ if (start != 0) {
+ // there is a fade in effect
+ QStringList clipeffects = item->effectNames();
+ QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade out"));
+ int end = (item->duration() - item->cropStart()).frames(m_document->fps());
+ start = end - start;
+ EffectsList::setParameter(oldeffect, "in", QString::number(start));
+ EffectsList::setParameter(oldeffect, "out", QString::number(end));
+ QMap <QString, QString> effectParams = item->getEffectArgs(oldeffect);
+ m_document->renderer()->mltEditEffect(m_tracksList.count() - item->track(), item->startPos(), effectParams);
+ }
+ }
+}
+
double CustomTrackView::getSnapPointForPos(double pos) {
for (int i = 0; i < m_snapPoints.size(); ++i) {
if (abs((int)(pos - m_snapPoints.at(i).frames(m_document->fps()) * m_scale)) < 10) {
GenTime end = item->endPos();
m_snapPoints.append(start);
m_snapPoints.append(end);
+ QList < GenTime > markers = item->snapMarkers();
+ for (int i = 0; i < markers.size(); ++i) {
+ GenTime t = markers.at(i);
+ m_snapPoints.append(t);
+ if (t > offset) m_snapPoints.append(t - offset);
+ }
if (offset != GenTime()) {
if (start > offset) m_snapPoints.append(start - offset);
if (end > offset) m_snapPoints.append(end - offset);
// kDebug() << "SNAP POINT: " << m_snapPoints.at(i).frames(25);
}
+void CustomTrackView::slotSeekToPreviousSnap() {
+ updateSnapPoints(NULL);
+ GenTime pos = GenTime(m_cursorPos, m_document->fps());
+ GenTime res = GenTime();
+ for (int i = 0; i < m_snapPoints.size(); ++i) {
+ if (m_snapPoints.at(i) >= pos) {
+ if (i == 0) i = 1;
+ res = m_snapPoints.at(i - 1);
+ break;
+ }
+ }
+ setCursorPos((int) res.frames(m_document->fps()));
+}
+
+void CustomTrackView::slotSeekToNextSnap() {
+ updateSnapPoints(NULL);
+ GenTime pos = GenTime(m_cursorPos, m_document->fps());
+ GenTime res = GenTime(m_projectDuration, m_document->fps());
+ for (int i = 0; i < m_snapPoints.size(); ++i) {
+ if (m_snapPoints.at(i) > pos) {
+ res = m_snapPoints.at(i);
+ break;
+ }
+ }
+ setCursorPos((int) res.frames(m_document->fps()));
+}
+
+void CustomTrackView::slotAddClipMarker() {
+ QList<QGraphicsItem *> itemList = scene()->selectedItems();
+ if (itemList.count() != 1) {
+ kDebug() << "// CANNOT ADD MARKER IF MORE TAN ONE CLIP IS SELECTED....";
+ return;
+ }
+ AbstractClipItem *item = (AbstractClipItem *)itemList.at(0);
+ if (item->type() != AVWIDGET) return;
+ GenTime pos = GenTime(m_cursorPos, m_document->fps());
+ if (item->startPos() > pos || item->endPos() < pos) return;
+ ClipItem *clip = (ClipItem *) item;
+ int id = clip->baseClip()->getId();
+ GenTime position = pos - item->startPos() + item->cropStart();
+ CommentedTime marker(position, i18n("Marker"));
+ MarkerDialog d(clip->baseClip(), marker, m_document->timecode(), this);
+ if (d.exec() == QDialog::Accepted) {
+ slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment());
+ }
+}
+
+void CustomTrackView::slotAddClipMarker(int id, GenTime t, QString c) {
+ QString oldcomment = m_document->clipManager()->getClipById(id)->markerComment(t);
+ AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, c, id, t, true);
+ m_commandStack->push(command);
+}
+
+void CustomTrackView::slotDeleteClipMarker() {
+ QList<QGraphicsItem *> itemList = scene()->selectedItems();
+ if (itemList.count() != 1) {
+ kDebug() << "// CANNOT DELETE MARKER IF MORE TAN ONE CLIP IS SELECTED....";
+ return;
+ }
+ AbstractClipItem *item = (AbstractClipItem *)itemList.at(0);
+ if (item->type() != AVWIDGET) return;
+ GenTime pos = GenTime(m_cursorPos, m_document->fps());
+ if (item->startPos() > pos || item->endPos() < pos) return;
+ ClipItem *clip = (ClipItem *) item;
+ int id = clip->baseClip()->getId();
+ GenTime position = pos - item->startPos() + item->cropStart();
+ QString comment = clip->baseClip()->markerComment(position);
+ if (comment.isEmpty()) return;
+ AddMarkerCommand *command = new AddMarkerCommand(this, comment, QString(), id, position, true);
+ m_commandStack->push(command);
+}
+
+void CustomTrackView::slotEditClipMarker() {
+ QList<QGraphicsItem *> itemList = scene()->selectedItems();
+ if (itemList.count() != 1) {
+ kDebug() << "// CANNOT DELETE MARKER IF MORE TAN ONE CLIP IS SELECTED....";
+ return;
+ }
+ AbstractClipItem *item = (AbstractClipItem *)itemList.at(0);
+ if (item->type() != AVWIDGET) return;
+ GenTime pos = GenTime(m_cursorPos, m_document->fps());
+ if (item->startPos() > pos || item->endPos() < pos) return;
+ ClipItem *clip = (ClipItem *) item;
+ int id = clip->baseClip()->getId();
+ GenTime position = pos - item->startPos() + item->cropStart();
+ QString oldcomment = clip->baseClip()->markerComment(position);
+ if (oldcomment.isEmpty()) return;
+
+ CommentedTime marker(position, oldcomment);
+ MarkerDialog d(clip->baseClip(), marker, m_document->timecode(), this);
+ if (d.exec() == QDialog::Accepted) {
+ if (d.newMarker().time() == position) {
+ // marker position was not changed, only text
+ AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, d.newMarker().comment(), id, position, true);
+ m_commandStack->push(command);
+ } else {
+ // marker text and position were changed, remove previous marker and add new one
+ AddMarkerCommand *command1 = new AddMarkerCommand(this, oldcomment, QString(), id, position, true);
+ AddMarkerCommand *command2 = new AddMarkerCommand(this, QString(), d.newMarker().comment(), id, d.newMarker().time(), true);
+ m_commandStack->push(command1);
+ m_commandStack->push(command2);
+ }
+ }
+}
+
+void CustomTrackView::addMarker(const int id, const GenTime &pos, const QString comment) {
+ DocClipBase *base = m_document->clipManager()->getClipById(id);
+ if (!comment.isEmpty()) base->addSnapMarker(pos, comment);
+ else base->deleteSnapMarker(pos);
+ m_document->setModified(true);
+ viewport()->update();
+}
+
+void CustomTrackView::setTool(PROJECTTOOL tool) {
+ m_tool = tool;
+}
void CustomTrackView::setScale(double scaleFactor) {
//scale(scaleFactor, scaleFactor);
projects / kdenlive / blobdiff