#include <KCursor>
#include "customtrackview.h"
+#include "docclipbase.h"
#include "clipitem.h"
#include "definitions.h"
#include "moveclipcommand.h"
+#include "movetransitioncommand.h"
#include "resizeclipcommand.h"
#include "addtimelineclipcommand.h"
#include "addeffectcommand.h"
#include "editeffectcommand.h"
#include "addtransitioncommand.h"
+#include "edittransitioncommand.h"
#include "kdenlivesettings.h"
#include "transition.h"
-
+#include "clipitem.h"
+#include "customtrackview.h"
+#include "clipmanager.h"
+#include "renderer.h"
//TODO:
// disable animation if user asked it in KDE's global settings
// http://lists.kde.org/?l=kde-commits&m=120398724717624&w=2
m_autoScroll = KdenliveSettings::autoscroll();
}
-QList <TRACKTYPE> CustomTrackView::tracksList() const {
+QList <TrackInfo> CustomTrackView::tracksList() const {
return m_tracksList;
}
int videoTracksCount = 0;
track --;
for (int i = track; i > -1; i--) {
- if (m_tracksList.at(i) == VIDEOTRACK) return i + 1;
+ if (m_tracksList.at(i).type == VIDEOTRACK) return i + 1;
}
return 0;
}
// virtual
void CustomTrackView::mouseMoveEvent(QMouseEvent * event) {
int pos = event->x();
- emit mousePosition(mapToScene(event->pos()).x() / m_scale);
+ emit mousePosition((int)(mapToScene(event->pos()).x() / m_scale));
/*if (event->modifiers() == Qt::ControlModifier)
setDragMode(QGraphicsView::ScrollHandDrag);
else if (event->modifiers() == Qt::ShiftModifier)
int offset = moveTrack - currentTrack;
if (offset != 0) offset = m_tracksHeight * offset;
- m_dragItem->moveTo(snappedPos / m_scale, m_scale, offset, moveTrack);
+ m_dragItem->moveTo((int)(snappedPos / m_scale), m_scale, offset, moveTrack);
} else if (m_operationMode == RESIZESTART) {
double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x());
- m_dragItem->resizeStart(snappedPos / m_scale, m_scale);
+ m_dragItem->resizeStart((int)(snappedPos / m_scale), m_scale);
} else if (m_operationMode == RESIZEEND) {
double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x());
- m_dragItem->resizeEnd(snappedPos / m_scale, m_scale);
+ m_dragItem->resizeEnd((int)(snappedPos / m_scale), m_scale);
} else if (m_operationMode == FADEIN) {
- int pos = mapToScene(event->pos()).x() / m_scale;
- m_dragItem->setFadeIn(pos - m_dragItem->startPos().frames(m_document->fps()), m_scale);
+ int pos = (int)(mapToScene(event->pos()).x() / m_scale);
+ m_dragItem->setFadeIn((int)(pos - m_dragItem->startPos().frames(m_document->fps())), m_scale);
} else if (m_operationMode == FADEOUT) {
- int pos = mapToScene(event->pos()).x() / m_scale;
- m_dragItem->setFadeOut(m_dragItem->endPos().frames(m_document->fps()) - pos, m_scale);
+ int pos = (int)(mapToScene(event->pos()).x() / m_scale);
+ m_dragItem->setFadeOut((int)(m_dragItem->endPos().frames(m_document->fps()) - pos), m_scale);
}
if (m_animation) delete m_animation;
kDebug() << "******** RESIZE CLIP START; WIDTH: " << size;
if (m_visualTip == NULL) {
QPolygon polygon;
- polygon << QPoint(clip->rect().x(), clip->rect().y() + clip->rect().height() / 2 - size * 2);
- polygon << QPoint(clip->rect().x() + size * 2, clip->rect().y() + clip->rect().height() / 2);
- polygon << QPoint(clip->rect().x(), clip->rect().y() + clip->rect().height() / 2 + size * 2);
- polygon << QPoint(clip->rect().x(), clip->rect().y() + clip->rect().height() / 2 - size * 2);
+ polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
+ polygon << QPoint((int)(clip->rect().x() + size * 2), (int)(clip->rect().y() + clip->rect().height() / 2));
+ polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 + size * 2));
+ polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
m_visualTip = new QGraphicsPolygonItem(polygon);
((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
setCursor(KCursor("right_side", Qt::SizeHorCursor));
if (m_visualTip == NULL) {
QPolygon polygon;
- polygon << QPoint(clip->rect().x() + clip->rect().width(), clip->rect().y() + clip->rect().height() / 2 - size * 2);
- polygon << QPoint(clip->rect().x() + clip->rect().width() - size * 2, clip->rect().y() + clip->rect().height() / 2);
- polygon << QPoint(clip->rect().x() + clip->rect().width(), clip->rect().y() + clip->rect().height() / 2 + size * 2);
- polygon << QPoint(clip->rect().x() + clip->rect().width(), clip->rect().y() + clip->rect().height() / 2 - size * 2);
+ polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
+ polygon << QPoint((int)(clip->rect().x() + clip->rect().width() - size * 2), (int)(clip->rect().y() + clip->rect().height() / 2));
+ polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 + size * 2));
+ polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
m_visualTip = new QGraphicsPolygonItem(polygon);
((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
} else {
m_moveOpMode = NONE;
if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) {
- setCursorPos((int) mapToScene(event->pos().x(), 0).x() / m_scale);
+ setCursorPos((int)(mapToScene(event->pos().x(), 0).x() / m_scale));
}
if (m_visualTip) {
if (m_animation) delete m_animation;
} else if (item->type() == TRANSITIONWIDGET) {
transitionItem = m_dragItem;
}
- m_clickPoint = QPoint(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale, event->pos().y() - m_dragItem->rect().top());
+ m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale), (int)(event->pos().y() - m_dragItem->rect().top()));
m_operationMode = m_dragItem->operationMode(item->mapFromScene(mapToScene(event->pos())), m_scale);
if (m_operationMode == MOVE) setCursor(Qt::ClosedHandCursor);
if (m_operationMode == MOVE || m_operationMode == RESIZESTART)
m_startPos = QPointF(m_dragItem->endPos().frames(m_document->fps()), m_dragItem->track());
else if (m_operationMode == TRANSITIONSTART) {
Transition *tr = new Transition(
- QRect(m_dragItem->startPos().frames(m_document->fps()) *m_scale , m_dragItem->rect().y() + m_dragItem->rect().height() / 2,
- GenTime(2.5).frames(m_document->fps()) *m_scale , m_dragItem->rect().height()
+ QRect((int)(m_dragItem->startPos().frames(m_document->fps()) *m_scale) , (int)(m_dragItem->rect().y() + m_dragItem->rect().height() / 2),
+ (int)(GenTime(2.5).frames(m_document->fps()) *m_scale) , (int)(m_dragItem->rect().height())
),
(ClipItem*)m_dragItem, "luma" , m_dragItem->startPos(), m_dragItem->startPos() + GenTime(2.5), m_document->fps());
tr->setTrack(m_dragItem->track());
//emit clipItemSelected(NULL);
if (event->button() == Qt::RightButton) {
displayContextMenu(event->globalPos());
- } else setCursorPos((int) mapToScene(event->x(), 0).x() / m_scale);
+ } 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);
}
void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) {
- ClipItem *clip = getClipItemAt(pos.frames(m_document->fps()) + 1, m_tracksList.count() - track);
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track);
if (clip) {
QMap <QString, QString> effectParams = clip->addEffect(effect);
m_document->renderer()->mltAddEffect(track, pos, effectParams);
void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) {
QString index = effect.attribute("kdenlive_ix");
m_document->renderer()->mltRemoveEffect(track, pos, index);
- ClipItem *clip = getClipItemAt(pos.frames(m_document->fps()) + 1, m_tracksList.count() - track);
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track);
if (clip) {
clip->deleteEffect(index);
emit clipItemSelected(clip);
if (track == -1)
itemList = items();
else {
- ClipItem *clip = getClipItemAt(pos.frames(m_document->fps()) + 1, track);
+ 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;
for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == AVWIDGET && (itemList.at(i)->isSelected() || track != -1)) {
+ if (itemList.at(i)->type() == AVWIDGET && itemList.at(i)->isSelected()) {
ClipItem *item = (ClipItem *)itemList.at(i);
// the kdenlive_ix int is used to identify an effect in mlt's playlist, should
// not be changed
}
void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect) {
- ClipItem *clip = getClipItemAt(pos.frames(m_document->fps()) + 1, m_tracksList.count() - track);
+ 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") {
void CustomTrackView::slotAddTransition(ClipItem* clip , QDomElement transition, GenTime startTime , int startTrack) {
AddTransitionCommand* command = new AddTransitionCommand(this, startTrack, transition, startTime, true);
m_commandStack->push(command);
+ m_document->setModified(true);
}
void CustomTrackView::addTransition(int startTrack, GenTime startPos , QDomElement e) {
- QMap < QString, QString> map;
- QDomNamedNodeMap attribs = e.attributes();
- for (int i = 0;i < attribs.count();i++) {
- if (attribs.item(i).nodeName() != "type" &&
- attribs.item(i).nodeName() != "start" &&
- attribs.item(i).nodeName() != "end"
- )
- map[attribs.item(i).nodeName()] = attribs.item(i).nodeValue();
- }
-
- kDebug() << "---- ADDING transition " << e.attribute("type") << ", on tracks " << m_tracksList.count() - e.attribute("transition_track").toInt() << " / " << getPreviousVideoTrack(e.attribute("transition_track").toInt());
- m_document->renderer()->mltAddTransition(e.attribute("type"), getPreviousVideoTrack(e.attribute("transition_track").toInt()), m_tracksList.count() - e.attribute("transition_track").toInt() ,
+ kDebug() << "---- ADDING transition " << e.attribute("tag") << ", on tracks " << m_tracksList.count() - e.attribute("transition_track").toInt() << " / " << getPreviousVideoTrack(e.attribute("transition_track").toInt());
+ m_document->renderer()->mltAddTransition(e.attribute("tag"), getPreviousVideoTrack(e.attribute("transition_track").toInt()), m_tracksList.count() - e.attribute("transition_track").toInt() ,
GenTime(e.attribute("start").toInt(), m_document->renderer()->fps()),
GenTime(e.attribute("end").toInt(), m_document->renderer()->fps()),
- map);
+ e);
m_document->setModified(true);
}
void CustomTrackView::deleteTransition(int, GenTime, QDomElement e) {
QMap < QString, QString> map;
QDomNamedNodeMap attribs = e.attributes();
- m_document->renderer()->mltDeleteTransition(e.attribute("type"), m_tracksList.count() - 1 - e.attribute("transition_track").toInt(), m_tracksList.count() - e.attribute("transition_track").toInt() ,
+ m_document->renderer()->mltDeleteTransition(e.attribute("tag"), getPreviousVideoTrack(e.attribute("transition_track").toInt()), m_tracksList.count() - e.attribute("transition_track").toInt() ,
GenTime(e.attribute("start").toInt(), m_document->renderer()->fps()),
GenTime(e.attribute("end").toInt(), m_document->renderer()->fps()),
- map);
+ e);
+ 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->renderer()->fps()) , old, newEffect , 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"), m_tracksList.count() - 1 - transition.attribute("transition_track").toInt(), m_tracksList.count() - transition.attribute("transition_track").toInt() ,
+ GenTime(transition.attribute("start").toInt(), m_document->renderer()->fps()),
+ GenTime(transition.attribute("end").toInt(), m_document->renderer()->fps()),
+ transition);
+ repaint();
m_document->setModified(true);
}
int in = 0;
GenTime out = clip->duration();
//kdDebug()<<"- - - -CREATING CLIP, duration = "<<out<<", URL: "<<clip->fileURL();
- int trackTop = ((int) mapToScene(pos).y() / m_tracksHeight) * m_tracksHeight + 1;
- m_dropItem = new ClipItem(clip, ((int) mapToScene(pos).y() / m_tracksHeight), GenTime(), QRectF(mapToScene(pos).x() * m_scale, trackTop, out.frames(m_document->fps()) * m_scale, m_tracksHeight - 1), out, m_document->fps());
+ int trackTop = (int)(mapToScene(pos).y() / m_tracksHeight) * m_tracksHeight + 1;
+ m_dropItem = new ClipItem(clip, (int)(mapToScene(pos).y() / m_tracksHeight), GenTime(), QRectF(mapToScene(pos).x() * m_scale, trackTop, out.frames(m_document->fps()) * m_scale, m_tracksHeight - 1), out, 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) mapToScene(event->pos()).y() / m_tracksHeight; //) * (m_scale * 50) + m_scale;
- m_dropItem->moveTo(mapToScene(event->pos()).x() / m_scale, m_scale, (track - m_dropItem->track()) * m_tracksHeight, track);
+ int track = (int)(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")) {
event->acceptProposedAction();
}
void CustomTrackView::setDuration(int duration) {
- //kDebug() << "///////////// PRO DUR: " << duration << ", height: " << 50 * m_tracksList.count();
+ kDebug() << "///////////// PRO DUR: " << duration << ", SCALE. " << (m_projectDuration + 500) * m_scale << ", height: " << 50 * m_tracksList.count();
m_projectDuration = duration;
- scene()->setSceneRect(0, 0, (m_projectDuration + 500) * m_scale, scene()->sceneRect().height()); //50 * m_tracksCount);
+ setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height());
}
int CustomTrackView::duration() const {
return m_projectDuration;
}
-void CustomTrackView::addTrack(TRACKTYPE type) {
+void CustomTrackView::addTrack(TrackInfo type) {
m_tracksList << type;
m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_tracksList.count());
setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_tracksList.count());
m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_tracksList.count());
}
+
+void CustomTrackView::slotSwitchTrackAudio(int ix) {
+ int tracknumber = m_tracksList.count() - ix;
+ kDebug() << "///// MUTING TRK: " << ix << "; PL NUM: " << tracknumber;
+ m_tracksList[tracknumber - 1].isMute = !m_tracksList.at(tracknumber - 1).isMute;
+ m_document->renderer()->mltChangeTrackState(tracknumber, m_tracksList.at(tracknumber - 1).isMute, m_tracksList.at(tracknumber - 1).isBlind);
+}
+
+void CustomTrackView::slotSwitchTrackVideo(int ix) {
+ int tracknumber = m_tracksList.count() - ix;
+ m_tracksList[tracknumber - 1].isBlind = !m_tracksList.at(tracknumber - 1).isBlind;
+ m_document->renderer()->mltChangeTrackState(tracknumber, m_tracksList.at(tracknumber - 1).isMute, m_tracksList.at(tracknumber - 1).isBlind);
+}
+
void CustomTrackView::deleteClip(int clipId) {
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++) {
}
void CustomTrackView::setCursorPos(int pos, bool seek) {
- emit cursorMoved(m_cursorPos * m_scale, pos * m_scale);
+ emit cursorMoved((int)(m_cursorPos * m_scale), (int)(pos * m_scale));
m_cursorPos = pos;
m_cursorLine->setPos(pos * m_scale, 0);
if (seek) m_document->renderer()->seek(GenTime(pos, m_document->fps()));
}
int CustomTrackView::cursorPos() {
- return m_cursorPos * m_scale;
+ return (int)(m_cursorPos * m_scale);
}
void CustomTrackView::checkScrolling() {
int delta = rectInView.width() / 3;
int max = rectInView.right() + horizontalScrollBar()->value() - delta;
//kDebug() << "CURSOR POS: "<<m_cursorPos<< "Scale: "<<m_scale;
- if (m_cursorPos * m_scale >= max) horizontalScrollBar()->setValue(horizontalScrollBar()->value() + 1 + m_scale);
+ if (m_cursorPos * m_scale >= max) horizontalScrollBar()->setValue((int)(horizontalScrollBar()->value() + 1 + m_scale));
}
void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
setDragMode(QGraphicsView::NoDrag);
if (m_dragItem == NULL) return;
if (m_operationMode == MOVE) setCursor(Qt::OpenHandCursor);
- if (m_operationMode == MOVE && m_startPos.x() != m_dragItem->startPos().frames(m_document->fps())) {
+ if (m_operationMode == MOVE) {// && m_startPos.x() != m_dragItem->startPos().frames(m_document->fps())) {
// move clip
- MoveClipCommand *command = new MoveClipCommand(this, m_startPos, QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track()), false);
- m_commandStack->push(command);
- if (m_dragItem->type() == AVWIDGET) m_document->renderer()->mltMoveClip(m_tracksList.count() - m_startPos.y(), m_tracksList.count() - m_dragItem->track(), m_startPos.x(), m_dragItem->startPos().frames(m_document->fps()));
+ if (m_dragItem->type() == AVWIDGET) {
+ MoveClipCommand *command = new MoveClipCommand(this, m_startPos, QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track()), false);
+ m_commandStack->push(command);
+ m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - m_startPos.y()), (int)(m_tracksList.count() - m_dragItem->track()), (int) m_startPos.x(), (int)(m_dragItem->startPos().frames(m_document->fps())));
+ }
+ if (m_dragItem->type() == TRANSITIONWIDGET) {
+ Transition* transition = (Transition*)m_dragItem;
+ GenTime oldin = transition->transitionStartTime();
+ GenTime oldout = transition->transitionEndTime();
+ GenTime newin = m_dragItem->startPos();
+ GenTime newout = newin + (oldout - oldin);
+ transition->moveTransition(newin - oldin);
+ MoveTransitionCommand *command = new MoveTransitionCommand(this, QPointF(oldin.frames(m_document->fps()), oldout.frames(m_document->fps())), QPointF(newin.frames(m_document->fps()), newout.frames(m_document->fps())), (int) m_startPos.y(), (int)(m_dragItem->track()), false);
+ m_commandStack->push(command);
+ //kDebug()<<"/// MOVING TRS FROM: "<<(int)(m_tracksList.count() - m_startPos.y())<<", OFFSET: "<<(int) (m_dragItem->track() - m_startPos.y());
+ m_document->renderer()->mltMoveTransition(transition->transitionName(), (int)(m_tracksList.count() - m_startPos.y()), (int)(m_startPos.y() - m_dragItem->track()), oldin, oldout, newin, newout);
+ }
+
} else if (m_operationMode == RESIZESTART) {
// resize start
ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track()), true, false);
- if (m_dragItem->type() == AVWIDGET) m_document->renderer()->mltResizeClipStart(m_tracksList.count() - m_dragItem->track(), m_dragItem->endPos(), m_dragItem->startPos(), GenTime(m_startPos.x(), m_document->fps()), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos());
+ if (m_dragItem->type() == AVWIDGET) m_document->renderer()->mltResizeClipStart(m_tracksList.count() - m_dragItem->track(), m_dragItem->endPos(), m_dragItem->startPos(), GenTime((int)m_startPos.x(), m_document->fps()), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos());
m_commandStack->push(command);
m_document->renderer()->doRefresh();
} else if (m_operationMode == RESIZEEND) {
}
void CustomTrackView::addClip(QDomElement xml, int clipId, int track, GenTime startpos, const QRectF &rect, GenTime duration) {
- QRect r(startpos.frames(m_document->fps()) * m_scale, m_tracksHeight * track, duration.frames(m_document->fps()) * m_scale, m_tracksHeight - 1);
+ QRect r((int)(startpos.frames(m_document->fps()) * m_scale), m_tracksHeight * track, (int)(duration.frames(m_document->fps()) * m_scale), m_tracksHeight - 1);
DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId);
ClipItem *item = new ClipItem(baseclip, track, startpos, r, duration, m_document->fps());
scene()->addItem(item);
}
ClipItem *CustomTrackView::getClipItemAt(int pos, int track) {
- return (ClipItem *) scene()->itemAt(pos * m_scale, track * m_tracksHeight + m_tracksHeight / 2);
+ QList<QGraphicsItem *> list = scene()->items(QPointF(pos * m_scale, track * m_tracksHeight + m_tracksHeight / 2));
+ ClipItem *clip = NULL;
+ for (int i = 0; i < list.size(); ++i) {
+ if (list.at(i)->type() == AVWIDGET) {
+ clip = static_cast <ClipItem *>(list.at(i));
+ break;
+ }
+ }
+ return clip;
}
ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track) {
- return (ClipItem *) scene()->itemAt(pos.frames(m_document->fps()) * m_scale, track * m_tracksHeight + m_tracksHeight / 2);
+ int framepos = (int)(pos.frames(m_document->fps()) * m_scale);
+ return getClipItemAt(framepos, track);
+}
+
+Transition *CustomTrackView::getTransitionItemAt(int pos, int track) {
+ QList<QGraphicsItem *> list = scene()->items(QPointF(pos * m_scale, track * m_tracksHeight + m_tracksHeight / 2));
+ Transition *clip = NULL;
+ for (int i = 0; i < list.size(); ++i) {
+ if (list.at(i)->type() == TRANSITIONWIDGET) {
+ clip = static_cast <Transition *>(list.at(i));
+ break;
+ }
+ }
+ return clip;
+}
+
+Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) {
+ int framepos = (int)(pos.frames(m_document->fps()) * m_scale);
+ return getTransitionItemAt(framepos, track);
}
void CustomTrackView::moveClip(const QPointF &startPos, const QPointF &endPos) {
- ClipItem *item = getClipItemAt(startPos.x() + 1, startPos.y());
+ ClipItem *item = getClipItemAt((int)startPos.x() + 1, (int)startPos.y());
if (!item) {
kDebug() << "---------------- ERROR, CANNOT find clip to move at: " << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
return;
}
- kDebug() << "---------------- Move CLIP FROM: " << startPos.x() << ", END:" << endPos.x();
- item->moveTo(endPos.x(), m_scale, (endPos.y() - startPos.y()) * m_tracksHeight, endPos.y());
- m_document->renderer()->mltMoveClip(m_tracksList.count() - startPos.y(), m_tracksList.count() - endPos.y(), startPos.x(), endPos.x());
+ kDebug() << "---------------- Move CLIP FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << startPos.y() << " TO " << endPos.y();
+ item->moveTo((int)endPos.x(), m_scale, (int)((endPos.y() - startPos.y()) * m_tracksHeight), (int)endPos.y());
+ m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - startPos.y()), (int)(m_tracksList.count() - endPos.y()), (int) startPos.x(), (int)endPos.x());
+}
+
+void CustomTrackView::moveTransition(const QPointF &startPos, const QPointF &endPos, int oldtrack, int newtrack) {
+ Transition *item = getTransitionItemAt((int)startPos.x() + 1, oldtrack);
+ if (!item) {
+ kDebug() << "---------------- ERROR, CANNOT find transition to move at: " << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
+ return;
+ }
+ kDebug() << "---------------- Move TRANSITION FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << oldtrack << " TO " << newtrack;
+ item->moveTo((int)endPos.x(), m_scale, (newtrack - oldtrack) * m_tracksHeight, newtrack);
+ //item->moveTransition(GenTime((int) (endPos.x() - startPos.x()), m_document->fps()));
+ m_document->renderer()->mltMoveTransition(item->transitionName(), m_tracksList.count() - oldtrack, oldtrack - newtrack, GenTime((int) startPos.x(), m_document->fps()), GenTime((int) startPos.y(), m_document->fps()), GenTime((int) endPos.x(), m_document->fps()), GenTime((int) endPos.y(), m_document->fps()));
}
void CustomTrackView::resizeClip(const QPointF &startPos, const QPointF &endPos, bool resizeClipStart) {
int offset;
if (resizeClipStart) offset = 1;
else offset = -1;
- ClipItem *item = getClipItemAt(startPos.x() + offset, startPos.y());
+ ClipItem *item = getClipItemAt((int)(startPos.x() + offset), (int) 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_tracksList.count() - item->track(), item->endPos(), GenTime(endPos.x(), m_document->fps()), item->startPos(), item->cropStart() + GenTime(diff, m_document->fps()), item->cropStart() + GenTime(diff, m_document->fps()) + item->endPos() - GenTime(endPos.x(), m_document->fps()));
- item->resizeStart(endPos.x(), m_scale);
+ m_document->renderer()->mltResizeClipStart(m_tracksList.count() - item->track(), item->endPos(), GenTime((int)endPos.x(), m_document->fps()), item->startPos(), item->cropStart() + GenTime((int)diff, m_document->fps()), item->cropStart() + GenTime((int)diff, m_document->fps()) + item->endPos() - GenTime((int)endPos.x(), m_document->fps()));
+ item->resizeStart((int)endPos.x(), m_scale);
} else {
- m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - item->track(), item->startPos(), item->cropStart(), item->cropStart() + GenTime(endPos.x(), m_document->fps()) - item->startPos());
- item->resizeEnd(endPos.x(), m_scale);
+ m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - item->track(), item->startPos(), item->cropStart(), item->cropStart() + GenTime((int)endPos.x(), m_document->fps()) - item->startPos());
+ item->resizeEnd((int)endPos.x(), m_scale);
}
m_document->renderer()->doRefresh();
}
double CustomTrackView::getSnapPointForPos(double pos) {
for (int i = 0; i < m_snapPoints.size(); ++i) {
- if (abs(pos - m_snapPoints.at(i).frames(m_document->fps()) * m_scale) < 10) {
+ if (abs((int)(pos - m_snapPoints.at(i).frames(m_document->fps()) * m_scale)) < 10) {
//kDebug()<<" FOUND SNAP POINT AT: "<<m_snapPoints.at(i)<<", current pos: "<<pos / m_scale;
return m_snapPoints.at(i).frames(m_document->fps()) * m_scale + 0.5;
}
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET && itemList.at(i) != selected) {
- ClipItem *item = (ClipItem *)itemList.at(i);
+ ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
GenTime start = item->startPos();
GenTime end = item->endPos();
m_snapPoints.append(start);
if (start > offset) m_snapPoints.append(start - offset);
if (end > offset) m_snapPoints.append(end - offset);
}
+ } else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
+ Transition *transition = static_cast <Transition*>(itemList.at(i));
+ GenTime start = transition->transitionStartTime();
+ GenTime end = transition->transitionEndTime();
+ m_snapPoints.append(start);
+ m_snapPoints.append(end);
+ if (offset != GenTime()) {
+ if (start > offset) m_snapPoints.append(start - offset);
+ if (end > offset) m_snapPoints.append(end - offset);
+ }
}
}
qSort(m_snapPoints);
}
updateCursorPos();
centerOn(QPointF(cursorPos(), m_tracksHeight));
- scene()->setSceneRect(0, 0, (m_projectDuration + 500) * m_scale, scene()->sceneRect().height());
+ setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height());
}
void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) {
painter->drawLine(rectInView.left(), 0, rectInView.right(), 0);
uint max = m_tracksList.count();
for (uint i = 0; i < max;i++) {
- if (m_tracksList.at(max - i - 1) == AUDIOTRACK) painter->fillRect(rectInView.left(), m_tracksHeight * i + 1, rectInView.right() - rectInView.left() + 1, m_tracksHeight - 1, QBrush(QColor(240, 240, 255)));
+ if (m_tracksList.at(max - i - 1).type == AUDIOTRACK) painter->fillRect(rectInView.left(), m_tracksHeight * i + 1, rectInView.right() - rectInView.left() + 1, m_tracksHeight - 1, QBrush(QColor(240, 240, 255)));
painter->drawLine(rectInView.left(), m_tracksHeight * (i + 1), rectInView.right(), m_tracksHeight * (i + 1));
//painter->drawText(QRectF(10, 50 * i, 100, 50 * i + 49), Qt::AlignLeft, i18n(" Track ") + QString::number(i + 1));
}
projects / kdenlive / blobdiff