#include <KUrl>
#include <KIcon>
#include <KCursor>
-#include <KColorScheme>
#include <KMessageBox>
#include <KIO/NetAccess>
m_menuPosition(),
m_blockRefresh(false),
m_selectionGroup(NULL),
- m_selectedTrack(0)
+ m_selectedTrack(0),
+ m_controlModifier(false)
{
- if (doc) m_commandStack = doc->commandStack();
- else m_commandStack = NULL;
+ if (doc)
+ m_commandStack = doc->commandStack();
+ else
+ m_commandStack = NULL;
+
setMouseTracking(true);
setAcceptDrops(true);
setFrameShape(QFrame::NoFrame);
setLineWidth(0);
//setCacheMode(QGraphicsView::CacheBackground);
- //setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+ setAutoFillBackground(false);
setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
+ setContentsMargins(0, 0, 0, 0);
+
+ m_activeTrackBrush = KStatefulBrush(KColorScheme::View, KColorScheme::ActiveBackground, KSharedConfig::openConfig(KdenliveSettings::colortheme()));
pixmapCache = new KPixmapCache("kdenlive-thumbs");
- KdenliveSettings::setTrackheight(m_tracksHeight);
+
m_animationTimer = new QTimeLine(800);
m_animationTimer->setFrameRange(0, 5);
m_animationTimer->setUpdateInterval(100);
m_animationTimer->setLoopCount(0);
+
m_tipColor = QColor(0, 192, 0, 200);
- QColor border = QColor(255, 255, 255, 100);
- m_tipPen.setColor(border);
+ m_tipPen.setColor(QColor(255, 255, 255, 100));
m_tipPen.setWidth(3);
- setContentsMargins(0, 0, 0, 0);
+
const int maxHeight = m_tracksHeight * m_document->tracksCount();
setSceneRect(0, 0, sceneRect().width(), maxHeight);
verticalScrollBar()->setMaximum(maxHeight);
+ verticalScrollBar()->setTracking(true);
+ // repaint guides when using vertical scroll
+ connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides()));
+
m_cursorLine = projectscene->addLine(0, 0, 0, maxHeight);
m_cursorLine->setZValue(1000);
-
QPen pen1 = QPen();
pen1.setWidth(1);
pen1.setColor(palette().text().color());
m_cursorLine->setPen(pen1);
m_cursorLine->setFlag(QGraphicsItem::ItemIgnoresTransformations, true);
- KIcon razorIcon("edit-cut");
- m_razorCursor = QCursor(razorIcon.pixmap(22, 22));
-
- KIcon spacerIcon("kdenlive-spacer-tool");
- m_spacerCursor = QCursor(spacerIcon.pixmap(22, 22));
- verticalScrollBar()->setTracking(true);
- // Line below was supposed to scroll guides label with scrollbar, not implemented yet
- //connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides()));
connect(&m_scrollTimer, SIGNAL(timeout()), this, SLOT(slotCheckMouseScrolling()));
m_scrollTimer.setInterval(100);
m_scrollTimer.setSingleShot(true);
connect(&m_thumbsTimer, SIGNAL(timeout()), this, SLOT(slotFetchNextThumbs()));
m_thumbsTimer.setInterval(500);
m_thumbsTimer.setSingleShot(true);
+
+ KIcon razorIcon("edit-cut");
+ m_razorCursor = QCursor(razorIcon.pixmap(22, 22));
+
+ KIcon spacerIcon("kdenlive-spacer-tool");
+ m_spacerCursor = QCursor(spacerIcon.pixmap(22, 22));
}
CustomTrackView::~CustomTrackView()
}
}
double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22();
- m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight);
+ m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight - 1);
for (int i = 0; i < m_guides.count(); i++) {
QLineF l = m_guides.at(i)->line();
}
} else if (m_operationMode == RESIZESTART && move) {
m_document->renderer()->pause();
- if (event->modifiers() != Qt::ControlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
+ if (!m_controlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
AbstractGroupItem *parent = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
if (parent)
- parent->resizeStart((int)(snappedPos) - m_dragItemInfo.startPos.frames(m_document->fps()));
+ parent->resizeStart((int)(snappedPos - m_dragItemInfo.startPos.frames(m_document->fps())));
} else {
m_dragItem->resizeStart((int)(snappedPos));
}
+ QString crop = m_document->timecode().getDisplayTimecode(m_dragItem->cropStart(), KdenliveSettings::frametimecode());
+ QString duration = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration(), KdenliveSettings::frametimecode());
+ QString offset = m_document->timecode().getDisplayTimecode(m_dragItem->cropStart() - m_dragItemInfo.cropStart, KdenliveSettings::frametimecode());
+ emit displayMessage(i18n("Crop from start:") + ' ' + crop + ' ' + i18n("Duration:") + ' ' + duration + ' ' + i18n("Offset:") + ' ' + offset, InformationMessage);
} else if (m_operationMode == RESIZEEND && move) {
m_document->renderer()->pause();
- if (event->modifiers() != Qt::ControlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
+ if (!m_controlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
AbstractGroupItem *parent = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
if (parent)
- parent->resizeEnd((int)(snappedPos) - m_dragItemInfo.endPos.frames(m_document->fps()));
+ parent->resizeEnd((int)(snappedPos - m_dragItemInfo.endPos.frames(m_document->fps())));
} else {
m_dragItem->resizeEnd((int)(snappedPos));
}
+ QString duration = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration(), KdenliveSettings::frametimecode());
+ QString offset = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration() - m_dragItemInfo.cropDuration, KdenliveSettings::frametimecode());
+ emit displayMessage(i18n("Duration:") + ' ' + duration + ' ' + i18n("Offset:") + ' ' + offset, InformationMessage);
} else if (m_operationMode == FADEIN && move) {
((ClipItem*) m_dragItem)->setFadeIn((int)(mappedXPos - m_dragItem->startPos().frames(m_document->fps())));
} else if (m_operationMode == FADEOUT && move) {
double maxh = 100.0 / br.height();
pos = (br.bottom() - pos) * maxh;
m_dragItem->updateKeyFramePos(keyFramePos, pos);
+ QString position = m_document->timecode().getDisplayTimecodeFromFrames(m_dragItem->editedKeyFramePos(), KdenliveSettings::frametimecode());
+ emit displayMessage(position + " : " + QString::number(m_dragItem->editedKeyFrameValue()), InformationMessage);
}
removeTipAnimation();
return;
m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y()));
m_operationMode = m_dragItem->operationMode(mapToScene(event->pos()));
+ m_controlModifier = (event->modifiers() == Qt::ControlModifier);
// Update snap points
if (m_selectionGroup == NULL) {
clipInfo.endPos = clipInfo.startPos + d.duration();
clipInfo.track = item->track();
MoveTransitionCommand *command = new MoveTransitionCommand(this, startInfo, clipInfo, true);
+ updateTrackDuration(clipInfo.track, command);
m_commandStack->push(command);
} else {
// move and resize clip
clipInfo.cropStart = d.cropStart();
new ResizeClipCommand(this, startInfo, clipInfo, true, false, moveCommand);
}
+ updateTrackDuration(clipInfo.track, moveCommand);
m_commandStack->push(moveCommand);
}
}
}
AddTimelineClipCommand *command = new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), pasteInfo, EffectsList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false);
+ updateTrackDuration(pasteInfo.track, command);
m_commandStack->push(command);
selectClip(true, false);
{
if (pos < GenTime()) {
// Add track effect
+ clearSelection();
m_document->addTrackEffect(track - 1, effect);
m_document->renderer()->mltAddTrackEffect(track, getEffectArgs(effect));
emit updateTrackEffectState(track - 1);
QString index = effect.attribute("kdenlive_ix");
if (pos < GenTime()) {
// Delete track effect
- m_document->removeTrackEffect(track - 1, effect);
- m_document->renderer()->mltRemoveTrackEffect(track, index, true);
+ if (m_document->renderer()->mltRemoveTrackEffect(track, index, true)) {
+ m_document->removeTrackEffect(track - 1, effect);
+ }
+ else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
emit updateTrackEffectState(track - 1);
emit showTrackEffects(track, m_document->trackInfoAt(track - 1));
return;
if (effectCommand->childCount() > 0) {
m_commandStack->push(effectCommand);
setDocumentModified();
+ if (effectCommand->childCount() == 1) {
+ // Display newly added clip effect
+ for (int i = 0; i < itemList.count(); i++) {
+ if (itemList.at(i)->type() == AVWIDGET) {
+ ClipItem *clip = static_cast<ClipItem *>(itemList.at(i));
+ if (!clip->isSelected()) {
+ clearSelection();
+ clip->setSelected(true);
+ }
+ clip->setSelectedEffect(clip->effectsCount() - 1);
+ emit clipItemSelected(clip, clip->effectsCount() - 1);
+ break;
+ }
+ }
+ }
} else delete effectCommand;
}
return;
}
QDomElement effect = insertedEffect.cloneNode().toElement();
- kDebug() << "// update effect ix: " << effect.attribute("kdenlive_ix");
+ //kDebug() << "// update effect ix: " << effect.attribute("kdenlive_ix")<<", TRACK: "<<track;
if (pos < GenTime()) {
// editing a track effect
EffectsParameterList effectParams = getEffectArgs(effect);
if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - track, pos, effectParams))
emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
m_document->setTrackEffect(m_document->tracksCount() - track - 1, ix, effect);
- emit updateTrackEffectState(track - 1);
+ emit updateTrackEffectState(track);
setDocumentModified();
return;
return;
}
EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, xml, false);
+ updateTrackDuration(tr->track(), command);
m_commandStack->push(command);
setDocumentModified();
}
return;
}
bool force = false;
- if (oldTransition.attribute("transition_atrack") != transition.attribute("transition_atrack") || oldTransition.attribute("transition_btrack") != transition.attribute("transition_btrack")) force = true;
+ if (oldTransition.attribute("transition_atrack") != transition.attribute("transition_atrack") || oldTransition.attribute("transition_btrack") != transition.attribute("transition_btrack"))
+ force = true;
m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition, force);
//kDebug() << "ORIGINAL TRACK: "<< oldTransition.attribute("transition_btrack") << ", NEW TRACK: "<<transition.attribute("transition_btrack");
item->setTransitionParameters(transition);
adjustTimelineClips(m_scene->editMode(), item, ItemInfo(), addCommand);
new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, false, false, addCommand);
+ updateTrackDuration(clipInfo.track, addCommand);
if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) {
// add transparency transition
*/
m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
- if (items.count() > 1) groupSelectedItems(true);
- else if (items.count() == 1) m_dragItem = static_cast <ClipItem *>(items.at(0));
+ if (items.count() > 1) {
+ groupSelectedItems(true);
+ } else if (items.count() == 1) {
+ m_dragItem = static_cast <AbstractClipItem *>(items.at(0));
+ emit clipItemSelected((ClipItem*)m_dragItem);
+ }
event->setDropAction(Qt::MoveAction);
event->accept();
} else QGraphicsView::dropEvent(event);
if (clip->speed() != 1.0) continue;
// We add a move clip command so that we get the correct producer for new track number
if (clip->clipType() == AV || clip->clipType() == AUDIO) {
- Mlt::Producer *prod;
- if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(clipinfo.track);
- else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer();
- else prod = clip->baseClip()->producer(clipinfo.track);
+ Mlt::Producer *prod = clip->getProducer(clipinfo.track);
if (m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod) == false) {
// problem updating clip
emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", clipinfo.startPos.frames(m_document->fps()), clipinfo.track), ErrorMessage);
l.setP2(QPointF(l.x2(), maxHeight));
m_guides.at(i)->setLine(l);
}
- m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight);
+
+ m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight - 1);
setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
viewport()->update();
- emit tracksChanged();
//QTimer::singleShot(500, this, SIGNAL(trackHeightChanged()));
//setFixedHeight(50 * m_tracksCount);
+
+ updateTrackNames(ix, true);
}
void CustomTrackView::removeTrack(int ix)
ItemInfo clipinfo = clip->info();
// We add a move clip command so that we get the correct producer for new track number
if (clip->clipType() == AV || clip->clipType() == AUDIO) {
- Mlt::Producer *prod;
- if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(clipinfo.track);
- else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer();
- else prod = clip->baseClip()->producer(clipinfo.track);
+ Mlt::Producer *prod = clip->getProducer(clipinfo.track);
if (!m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod)) {
emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", clipinfo.startPos.frames(m_document->fps()), clipinfo.track), ErrorMessage);
}
l.setP2(QPointF(l.x2(), maxHeight));
m_guides.at(i)->setLine(l);
}
- m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight);
+ m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight - 1);
setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
m_selectedTrack = qMin(m_selectedTrack, m_document->tracksCount() - 1);
viewport()->update();
- emit tracksChanged();
+
+ updateTrackNames(ix, false);
//QTimer::singleShot(500, this, SIGNAL(trackHeightChanged()));
}
lockTrack(m_document->tracksCount() - i - 1, m_document->trackInfoAt(i).isLocked, false);
}
- QTimer::singleShot(300, this, SIGNAL(trackHeightChanged()));
viewport()->update();
+ emit trackHeightChanged();
}
void CustomTrackView::slotSwitchTrackAudio(int ix)
QList<QGraphicsItem *> selection = m_scene->items(0, ix * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), m_tracksHeight / 2 - 2);
for (int i = 0; i < selection.count(); i++) {
- if (selection.at(i)->type() != AVWIDGET && selection.at(i)->type() != TRANSITIONWIDGET) continue;
- if (selection.at(i)->isSelected()) {
- if (selection.at(i)->type() == AVWIDGET) emit clipItemSelected(NULL);
- else emit transitionItemSelected(NULL);
+ if (selection.at(i)->type() == GROUPWIDGET && (AbstractGroupItem *)selection.at(i) != m_selectionGroup) {
+ if (selection.at(i)->parentItem() && m_selectionGroup) {
+ selection.removeAll((QGraphicsItem*)m_selectionGroup);
+ resetSelectionGroup();
+ }
+
+ bool changeGroupLock = true;
+ bool hasClipOnTrack = false;
+ QList <QGraphicsItem *> children = selection.at(i)->childItems();
+ for (int j = 0; j < children.count(); ++j) {
+ if (children.at(j)->isSelected()) {
+ if (children.at(j)->type() == AVWIDGET)
+ emit clipItemSelected(NULL);
+ else if (children.at(j)->type() == TRANSITIONWIDGET)
+ emit transitionItemSelected(NULL);
+ else
+ continue;
+ }
+
+ AbstractClipItem * child = static_cast <AbstractClipItem *>(children.at(j));
+ if (child == m_dragItem)
+ m_dragItem = NULL;
+
+ // only unlock group, if it is not locked by another track too
+ if (!lock && child->track() != ix && m_document->trackInfoAt(m_document->tracksCount() - child->track() - 1).isLocked)
+ changeGroupLock = false;
+
+ // only (un-)lock if at least one clip is on the track
+ if (child->track() == ix)
+ hasClipOnTrack = true;
+ }
+ if (changeGroupLock && hasClipOnTrack)
+ ((AbstractGroupItem*)selection.at(i))->setItemLocked(lock);
+ } else if((selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)) {
+ if (selection.at(i)->parentItem()) {
+ if (selection.at(i)->parentItem() == m_selectionGroup) {
+ selection.removeAll((QGraphicsItem*)m_selectionGroup);
+ resetSelectionGroup();
+ } else {
+ // groups are handled separately
+ continue;
+ }
+ }
+
+ if (selection.at(i)->isSelected()) {
+ if (selection.at(i)->type() == AVWIDGET)
+ emit clipItemSelected(NULL);
+ else
+ emit transitionItemSelected(NULL);
+ }
+ clip = static_cast <AbstractClipItem *>(selection.at(i));
+ clip->setItemLocked(lock);
+ if (clip == m_dragItem)
+ m_dragItem = NULL;
}
- clip = static_cast <AbstractClipItem *>(selection.at(i));
- clip->setItemLocked(lock);
- if (clip == m_dragItem)
- m_dragItem = NULL;
}
kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isLocked;
viewport()->update();
}
InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, GenTime(-length, m_document->fps()), true);
+ updateTrackDuration(track, command);
m_commandStack->push(command);
}
if (!clipsToMove.isEmpty() || !transitionsToMove.isEmpty()) {
InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, spaceDuration, true);
+ updateTrackDuration(track, command);
m_commandStack->push(command);
}
}
}
}
deleteCommand->setText(i18np("Delete timeline clip", "Delete timeline clips", count));
- if (count == 0) delete deleteCommand;
- else m_commandStack->push(deleteCommand);
+ if (count == 0) {
+ delete deleteCommand;
+ } else {
+ updateTrackDuration(-1, deleteCommand);
+ m_commandStack->push(deleteCommand);
+ }
}
void CustomTrackView::setCursorPos(int pos, bool seek)
}
if (!clipsToMove.isEmpty() || !transitionsToMove.isEmpty()) {
InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, timeOffset, false);
+ updateTrackDuration(track, command);
m_commandStack->push(command);
if (track != -1) track = m_document->tracksCount() - track;
kDebug() << "SPACER TRACK:" << track;
// we are moving one clip, easy
if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
ClipItem *item = static_cast <ClipItem *>(m_dragItem);
- Mlt::Producer *prod;
- if (item->isAudioOnly()) prod = item->baseClip()->audioProducer(info.track);
- else if (item->isVideoOnly()) prod = item->baseClip()->videoProducer();
- else prod = item->baseClip()->producer(info.track);
+ Mlt::Producer *prod = item->getProducer(info.track);
bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - info.track), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(info.startPos.frames(m_document->fps())), prod, m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT);
if (success) {
}
}
}
+ updateTrackDuration(info.track, moveCommand);
+ if (m_dragItemInfo.track != info.track)
+ updateTrackDuration(m_dragItemInfo.track, moveCommand);
m_commandStack->push(moveCommand);
//checkTrackSequence(m_dragItem->track());
} else {
moveCommand->setText(i18n("Move transition"));
adjustTimelineTransitions(m_scene->editMode(), transition, moveCommand);
new MoveTransitionCommand(this, m_dragItemInfo, info, false, moveCommand);
+ updateTrackDuration(info.track, moveCommand);
+ if (m_dragItemInfo.track != info.track)
+ updateTrackDuration(m_dragItemInfo.track, moveCommand);
m_commandStack->push(moveCommand);
setDocumentModified();
}
GenTime timeOffset = GenTime(m_dragItem->scenePos().x(), m_document->fps()) - m_dragItemInfo.startPos;
const int trackOffset = (int)(m_dragItem->scenePos().y() / m_tracksHeight) - m_dragItemInfo.track;
- //kDebug() << "// MOVED SEVERAL CLIPS" << timeOffset.frames(25);
+
QUndoCommand *moveGroup = new QUndoCommand();
moveGroup->setText(i18n("Move group"));
if (timeOffset != GenTime() || trackOffset != 0) {
if (item->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem*>(item);
info.track = m_document->tracksCount() - info.track;
- Mlt::Producer *prod;
adjustTimelineClips(m_scene->editMode(), clip, ItemInfo(), moveGroup);
- if (clip->isAudioOnly())
- prod = clip->baseClip()->audioProducer(info.track);
- else if (clip->isVideoOnly())
- prod = clip->baseClip()->videoProducer();
- else
- prod = clip->baseClip()->producer(info.track);
- m_document->renderer()->mltInsertClip(info, clip->xml(), prod, m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT);
+ m_document->renderer()->mltInsertClip(info, clip->xml(), clip->getProducer(info.track), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT);
for (int i = 0; i < clip->effectsCount(); i++) {
m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(clip->effectAt(i)), false);
}
}
}
new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false, moveGroup);
+ updateTrackDuration(-1, moveGroup);
m_commandStack->push(moveGroup);
//QPointF top = group->sceneBoundingRect().topLeft();
m_document->renderer()->doRefresh();
} else if (m_operationMode == RESIZESTART && m_dragItem->startPos() != m_dragItemInfo.startPos) {
// resize start
- if (event->modifiers() != Qt::ControlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
+ if (!m_controlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
AbstractGroupItem *parent = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
if (parent) {
QUndoCommand *resizeCommand = new QUndoCommand();
}
} else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) {
// resize end
- if (event->modifiers() != Qt::ControlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
+ if (!m_controlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
AbstractGroupItem *parent = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
if (parent) {
QUndoCommand *resizeCommand = new QUndoCommand();
++itemcount;
}
}
+ updateTrackDuration(-1, resizeCommand);
m_commandStack->push(resizeCommand);
}
} else {
int start = item->cropStart().frames(m_document->fps());
int end = (item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1;
- if ((val < -50 || val > 150) && item->editedKeyFramePos() != start && item->editedKeyFramePos() != end) {
+ if ((val < -50 || val > 150) && item->editedKeyFramePos() != start && item->editedKeyFramePos() != end && item->keyFrameNumber() > 1) {
//delete keyframe
item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), -1, 0);
} else {
else if (transitionCount > 0 && groupCount == 0 && clipCount == 0)
deleteSelected->setText(i18np("Delete selected transition", "Delete selected transitions", transitionCount));
else deleteSelected->setText(i18n("Delete selected items"));
+ updateTrackDuration(-1, deleteSelected);
m_commandStack->push(deleteSelected);
}
void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id)
{
- DocClipBase *baseclip = m_document->clipManager()->getClipById(id);
+ Q_UNUSED(id);
+ //DocClipBase *baseclip = m_document->clipManager()->getClipById(id);
+
ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
if (!item) {
kDebug() << "ERROR: Cannot find clip for speed change";
return;
}
info.track = m_document->tracksCount() - item->track();
- int endPos;
- if (item->isVideoOnly())
- endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->videoProducer());
- else if (item->isAudioOnly())
- endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->audioProducer(item->track()));
- else
- endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->producer());
+ int endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, item->getProducer(item->track(), false));
if (endPos >= 0) {
item->setSpeed(speed, strobe);
item->updateRectGeometry();
- if (item->cropDuration().frames(m_document->fps()) != endPos) {
+ if (item->cropDuration().frames(m_document->fps()) != endPos)
item->resizeEnd((int) info.startPos.frames(m_document->fps()) + endPos - 1);
- }
updatePositionEffects(item, info);
setDocumentModified();
- } else emit displayMessage(i18n("Invalid clip"), ErrorMessage);
+ } else {
+ emit displayMessage(i18n("Invalid clip"), ErrorMessage);
+ }
}
void CustomTrackView::cutSelectedClips()
baseclip->addReference();
m_document->updateClip(baseclip->getId());
info.track = m_document->tracksCount() - info.track;
- Mlt::Producer *prod;
- if (item->isAudioOnly()) prod = baseclip->audioProducer(info.track);
- else if (item->isVideoOnly()) prod = baseclip->videoProducer();
- else prod = baseclip->producer(info.track);
- m_document->renderer()->mltInsertClip(info, xml, prod, overwrite, push);
+ m_document->renderer()->mltInsertClip(info, xml, item->getProducer(info.track), overwrite, push);
for (int i = 0; i < item->effectsCount(); i++) {
m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(item->effectAt(i)), false);
}
setDocumentModified();
- if (refresh) m_document->renderer()->doRefresh();
- if (!baseclip->isPlaceHolder()) m_waitingThumbs.append(item);
+ if (refresh)
+ m_document->renderer()->doRefresh();
+ if (!baseclip->isPlaceHolder())
+ m_waitingThumbs.append(item);
m_thumbsTimer.start();
}
kDebug() << "---------------- ERROR, CANNOT find clip to move at.. ";
return;
}
- Mlt::Producer *prod;
- if (item->isAudioOnly()) prod = item->baseClip()->audioProducer(end.track);
- else if (item->isVideoOnly()) prod = item->baseClip()->videoProducer();
- else prod = item->baseClip()->producer(end.track);
+ Mlt::Producer *prod = item->getProducer(end.track);
bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - start.track), (int)(m_document->tracksCount() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()), prod);
if (success) {
emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(end.startPos.frames(m_document->fps()))), ErrorMessage);
}
if (refresh) m_document->renderer()->doRefresh();
- //kDebug() << " // MOVED CLIP TO: " << end.startPos.frames(25) << ", ITEM START: " << item->startPos().frames(25);
}
void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> startTransition, const GenTime offset, const int trackOffset, bool reverseMove)
{
// Group Items
- /*kDebug() << "//GRP MOVE, REVERS:" << reverseMove;
- kDebug() << "// GROUP MOV; OFFSET: " << offset.frames(25) << ", TK OFF: " << trackOffset;*/
resetSelectionGroup();
m_scene->clearSelection();
startClip[i].startPos = startClip.at(i).startPos - offset;
startClip[i].track = startClip.at(i).track - trackOffset;
}
- //kDebug()<<"//LKING FR CLIP AT:"<<startClip.at(i).startPos.frames(25)<<", TK:"<<startClip.at(i).track;
ClipItem *clip = getClipItemAt(startClip.at(i).startPos, startClip.at(i).track);
if (clip) {
clip->setItemLocked(false);
if (item->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem*>(item);
info.track = m_document->tracksCount() - info.track;
- Mlt::Producer *prod;
- if (clip->isAudioOnly())
- prod = clip->baseClip()->audioProducer(info.track);
- else if (clip->isVideoOnly())
- prod = clip->baseClip()->videoProducer();
- else
- prod = clip->baseClip()->producer(info.track);
- m_document->renderer()->mltInsertClip(info, clip->xml(), prod);
+ m_document->renderer()->mltInsertClip(info, clip->xml(), clip->getProducer(info.track));
for (int i = 0; i < clip->effectsCount(); i++) {
m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(clip->effectAt(i)), false);
}
kDebug() << "---------------- ERROR, CANNOT find transition to move... ";// << 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;
+
bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
- //kDebug()<<"/// RESIZE TRANS START: ("<< startPos.x()<<"x"<< startPos.y()<<") / ("<<endPos.x()<<"x"<< endPos.y()<<")";
+
if (end.endPos - end.startPos == start.endPos - start.startPos) {
// Transition was moved
item->setPos((int) end.startPos.frames(m_document->fps()), (end.track) * m_tracksHeight + 1);
bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
+
if (resizeClipStart) {
ItemInfo clipinfo = item->info();
clipinfo.track = m_document->tracksCount() - clipinfo.track;
*/
ClipItem *clip = static_cast < ClipItem * >(item);
+ updatePositionEffects(clip, oldInfo);
+
// check keyframes
QDomDocument doc;
QDomElement root = doc.createElement("list");
}
}
- updatePanZoom(clip);
-
if (clip->checkEffectsKeyframesPos(oldInfo.cropStart.frames(m_document->fps()), clip->cropStart().frames(m_document->fps()), true)) {
// Keyframes were modified, updateClip
QDomNodeList effs = doc.elementsByTagName("effect");
} else {
new ResizeClipCommand(this, oldInfo, info, false, false, command);
}
-
- updatePositionEffects(clip, oldInfo);
} else {
KdenliveSettings::setSnaptopoints(false);
item->resizeStart((int) oldInfo.startPos.frames(m_document->fps()));
if (item->type() == AVWIDGET) {
ItemInfo resizeinfo = info;
resizeinfo.track = m_document->tracksCount() - resizeinfo.track;
- bool success = m_document->renderer()->mltResizeClipEnd(resizeinfo, resizeinfo.endPos - resizeinfo.startPos);
+ bool success = m_document->renderer()->mltResizeClipEnd(resizeinfo, resizeinfo.cropDuration);
if (success) {
// Check if there is an automatic transition on that clip (lower track)
Transition *tr = getTransitionItemAtEnd(oldInfo.endPos, oldInfo.track);
}
- // check keyframes
ClipItem *clip = static_cast < ClipItem * >(item);
+
+ updatePositionEffects(clip, oldInfo);
+
+ // check keyframes
QDomDocument doc;
QDomElement root = doc.createElement("list");
doc.appendChild(root);
indexes.append(i);
}
}
-
- updatePanZoom(clip);
if (clip->checkEffectsKeyframesPos((oldInfo.cropStart + oldInfo.endPos - oldInfo.startPos).frames(m_document->fps()) - 1, (clip->cropStart() + clip->cropDuration()).frames(m_document->fps()) - 1, false)) {
// Keyframes were modified, updateClip
} else {
new ResizeClipCommand(this, oldInfo, info, false, false, command);
}
-
- updatePositionEffects(clip, oldInfo);
} else {
KdenliveSettings::setSnaptopoints(false);
item->resizeEnd((int) oldInfo.endPos.frames(m_document->fps()));
if (item->parentItem() && item->parentItem() != m_selectionGroup)
new RebuildGroupCommand(this, item->info().track, item->startPos(), command);
- if (!hasParentCommand)
+ if (!hasParentCommand) {
+ updateTrackDuration(oldInfo.track, command);
m_commandStack->push(command);
+ }
}
void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info)
}
}
- effectPos = item->hasEffect("affine", "pan_zoom");
- if (effectPos != -1) {
- QDomElement oldeffect = item->effectAt(effectPos);
- int start = item->cropStart().frames(m_document->fps());
- int max = start + item->cropDuration().frames(m_document->fps());
- if (start < 0) {
- max -= start;
- start = 0;
- }
- oldeffect.setAttribute("in", start);
- oldeffect.setAttribute("out", max);
-
- if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), getEffectArgs(oldeffect)))
- emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
- // if effect is displayed, update the effect edit widget with new clip duration
- if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
- }
+ updatePanZoom(item);
}
double CustomTrackView::getSnapPointForPos(double pos)
}
}
+ // add render zone
+ QPoint z = m_document->zone();
+ snaps.append(GenTime(z.x(), m_document->fps()));
+ snaps.append(GenTime(z.y(), m_document->fps()));
+
qSort(snaps);
m_scene->setSnapList(snaps);
//for (int i = 0; i < m_snapPoints.size(); ++i)
return true;
}
-void CustomTrackView::slotAddGuide()
+void CustomTrackView::slotAddGuide(bool dialog)
{
CommentedTime marker(GenTime(m_cursorPos, m_document->fps()), i18n("Guide"));
- MarkerDialog d(NULL, marker, m_document->timecode(), i18n("Add Guide"), this);
- if (d.exec() != QDialog::Accepted) return;
- if (addGuide(d.newMarker().time(), d.newMarker().comment())) {
- EditGuideCommand *command = new EditGuideCommand(this, GenTime(), QString(), d.newMarker().time(), d.newMarker().comment(), false);
+ if (dialog) {
+ MarkerDialog d(NULL, marker, m_document->timecode(), i18n("Add Guide"), this);
+ if (d.exec() != QDialog::Accepted) return;
+ marker.setComment(d.newMarker().comment());
+ } else {
+ marker.setComment(m_document->timecode().getDisplayTimecodeFromFrames(m_cursorPos, false));
+ }
+ if (addGuide(marker.time(), marker.comment())) {
+ EditGuideCommand *command = new EditGuideCommand(this, GenTime(), QString(), marker.time(), marker.comment(), false);
m_commandStack->push(command);
}
}
newmatrix = newmatrix.scale(scaleFactor, verticalScale);
m_scene->setScale(scaleFactor, verticalScale);
removeTipAnimation();
- double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y();
bool adjust = false;
if (verticalScale != matrix().m22()) adjust = true;
setMatrix(newmatrix);
if (adjust) {
double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22();
- m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight);
+ m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight - 1);
for (int i = 0; i < m_guides.count(); i++) {
QLineF l = m_guides.at(i)->line();
l.setP2(QPointF(l.x2(), newHeight));
else
setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height());
}
+ double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y();
centerOn(QPointF(cursorPos(), verticalPos));
}
void CustomTrackView::drawBackground(QPainter * painter, const QRectF &rect)
{
- //kDebug() << "// DRAW BG: " << rect.width();
painter->setClipRect(rect);
- KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window);
QPen pen1 = painter->pen();
- pen1.setColor(scheme.shade(KColorScheme::DarkShade));
+ pen1.setColor(palette().dark().color());
painter->setPen(pen1);
double min = rect.left();
double max = rect.right();
painter->drawLine(QPointF(min, 0), QPointF(max, 0));
int maxTrack = m_document->tracksCount();
- QColor lockedColor = scheme.background(KColorScheme::NegativeBackground).color();
+ QColor lockedColor = palette().button().color();
QColor audioColor = palette().alternateBase().color();
- QColor base = scheme.background(KColorScheme::NormalBackground).color();
for (int i = 0; i < maxTrack; i++) {
TrackInfo info = m_document->trackInfoAt(maxTrack - i - 1);
if (info.isLocked || info.type == AUDIOTRACK || i == m_selectedTrack) {
const QRectF track(min, m_tracksHeight * i + 1, max - min, m_tracksHeight - 1);
if (i == m_selectedTrack)
- painter->fillRect(track, scheme.background(KColorScheme::ActiveBackground).color());
+ painter->fillRect(track, m_activeTrackBrush.brush(this));
else
painter->fillRect(track, info.isLocked ? lockedColor : audioColor);
}
painter->drawLine(QPointF(min, m_tracksHeight *(i + 1)), QPointF(max, m_tracksHeight *(i + 1)));
}
- int lowerLimit = m_tracksHeight * maxTrack + 1;
- if (height() > lowerLimit) {
- const QRectF bg(min, lowerLimit, max - min, height() - lowerLimit);
- painter->fillRect(bg, base);
- }
}
bool CustomTrackView::findString(const QString &text)
} else emit displayMessage(i18n("Cannot paste transition to selected place"), ErrorMessage);
}
}
+ updateTrackDuration(-1, pasteClips);
m_commandStack->push(pasteClips);
}
}
}
-
for (int i = 0; i < clips.count(); ++i) {
if (clips.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast < ClipItem *>(clips.at(i));
if (d.before_select->currentIndex() == 1)
ix++;
TrackInfo info;
+ info.duration = 0;
info.isMute = false;
info.isLocked = false;
if (d.video_track->isChecked()) {
}
}
}
- if (splitCommand->childCount() > 0)
+ if (splitCommand->childCount()) {
+ updateTrackDuration(-1, splitCommand);
m_commandStack->push(splitCommand);
+ }
}
void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split)
if (split) {
int start = pos.frames(m_document->fps());
int freetrack = m_document->tracksCount() - track - 1;
+
+ // do not split audio when we are on an audio track
+ if (m_document->trackInfoAt(freetrack).type == AUDIOTRACK)
+ return;
+
for (; freetrack > 0; freetrack--) {
- kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack);
+ //kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack);
if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK && !m_document->trackInfoAt(freetrack - 1).isLocked) {
- kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack);
+ //kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack);
if (m_document->renderer()->mltTrackDuration(freetrack) < start || m_document->renderer()->mltGetSpaceLength(pos, freetrack, false) >= clip->cropDuration().frames(m_document->fps())) {
- kDebug() << "FOUND SPACE ON TRK: " << freetrack;
+ //kDebug() << "FOUND SPACE ON TRK: " << freetrack;
break;
}
}
addCommand->setText(i18n("Insert clip"));
adjustTimelineClips(OVERWRITEEDIT, NULL, info, addCommand);
new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), info, EffectsList(), true, false, true, false, addCommand);
+ updateTrackDuration(info.track, addCommand);
m_commandStack->push(addCommand);
selectClip(true, false, m_selectedTrack, in);
void CustomTrackView::updatePalette()
{
+ m_activeTrackBrush = KStatefulBrush(KColorScheme::View, KColorScheme::ActiveBackground, KSharedConfig::openConfig(KdenliveSettings::colortheme()));
if (m_cursorLine) {
QPen pen1 = QPen();
pen1.setWidth(1);
pen1.setColor(palette().text().color());
m_cursorLine->setPen(pen1);
}
+ emit tracksChanged();
}
void CustomTrackView::removeTipAnimation()
QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts);
double factor = e.attribute("factor", "1").toDouble();
for (int j = 0; j < values.count(); j++) {
- QString pos = values.at(j).section(":", 0, 0);
- double val = values.at(j).section(":", 1, 1).toDouble() / factor;
+ QString pos = values.at(j).section(':', 0, 0);
+ double val = values.at(j).section(':', 1, 1).toDouble() / factor;
values[j] = pos + "=" + QString::number(val);
}
// kDebug() << "/ / / /SENDING KEYFR:" << values;
emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
// if effect is displayed, update the effect edit widget with new clip duration
- if (item->isSelected() && effects.at(i) == item->selectedEffectIndex())
- emit clipItemSelected(item, effects.at(i));
+ /*if (item->isSelected() && effects.at(i) == item->selectedEffectIndex())
+ emit clipItemSelected(item, effects.at(i));*/
+ }
+ // update always, otherwise there might problems when resizing groups
+ if (effects.count() > 0)
+ emit clipItemSelected(item, item->selectedEffectIndex());
+}
+
+void CustomTrackView::updateTrackNames(int track, bool added)
+{
+ QList <TrackInfo> tracks = m_document->tracksList();
+ int max = tracks.count();
+ int docTrack = max - track - 1;
+
+ // count number of tracks of each type
+ int videoTracks = 0;
+ int audioTracks = 0;
+ for (int i = max - 1; i >= 0; --i) {
+ TrackInfo info = tracks.at(i);
+ if (info.type == VIDEOTRACK)
+ videoTracks++;
+ else
+ audioTracks++;
+
+ if (i <= docTrack) {
+ QString type = (info.type == VIDEOTRACK ? "Video " : "Audio ");
+ int typeNumber = (info.type == VIDEOTRACK ? videoTracks : audioTracks);
+
+ if (added) {
+ if (i == docTrack || info.trackName == type + QString::number(typeNumber - 1)) {
+ info.trackName = type + QString::number(typeNumber);
+ m_document->setTrackType(i, info);
+ }
+ } else {
+ if (info.trackName == type + QString::number(typeNumber + 1)) {
+ info.trackName = type + QString::number(typeNumber);
+ m_document->setTrackType(i, info);
+ }
+ }
+ }
}
+ emit tracksChanged();
}
+
+void CustomTrackView::updateTrackDuration(int track, QUndoCommand *command)
+{
+ Q_UNUSED(command);
+
+ QList<int> tracks;
+ if (track >= 0) {
+ tracks << m_document->tracksCount() - track - 1;
+ } else {
+ // negative track number -> update all tracks
+ for (int i = 0; i < m_document->tracksCount(); ++i)
+ tracks << i;
+ }
+ int t, duration;
+ for (int i = 0; i < tracks.count(); ++i) {
+ t = tracks.at(i);
+ // t + 1 because of black background track
+ duration = m_document->renderer()->mltTrackDuration(t + 1);
+ if (duration != m_document->trackDuration(t)) {
+ m_document->setTrackDuration(t, duration);
+
+ // update effects
+ EffectsList effects = m_document->getTrackEffects(t);
+ for (int j = 0; j < effects.count(); ++j) {
+ /* TODO
+ * - lookout for keyframable parameters and update them so all keyframes are in the new range (0 - duration)
+ * - update the effectstack if necessary
+ */
+ }
+ }
+ }
+}
+
+