#include <QInputDialog>
+bool sortGuidesList(const Guide *g1 , const Guide *g2)
+{
+ return (*g1).position() < (*g2).position();
+}
+
+
//TODO:
// disable animation if user asked it in KDE's global settings
// http://lists.kde.org/?l=kde-commits&m=120398724717624&w=2
AbstractClipItem *clip = static_cast <AbstractClipItem*>(item);
if (m_tool == RAZORTOOL) {
// razor tool over a clip, display current frame in monitor
- if (!m_blockRefresh && item->type() == AVWIDGET) {
+ if (false && /*!m_blockRefresh && */item->type() == AVWIDGET) {
//TODO: solve crash when showing frame when moving razor over clip
- //emit showClipFrame(((ClipItem *) item)->baseClip(), mappedXPos - (clip->startPos() - clip->cropStart()).frames(m_document->fps()));
+ emit showClipFrame(((ClipItem *) item)->baseClip(), mappedXPos - (clip->startPos() - clip->cropStart()).frames(m_document->fps()));
}
event->accept();
return;
kDebug() << "SELELCTING ELEMENTS WITHIN =" << event->pos().x() << "/" << 1 << ", " << mapFromScene(sceneRect().width(), 0).x() - event->pos().x() << "/" << sceneRect().height();
}
+ QList <GenTime> offsetList;
for (int i = 0; i < selection.count(); i++) {
- if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) {
+ if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) {
+ AbstractClipItem *item = static_cast<AbstractClipItem *>(selection.at(i));
+ offsetList.append(item->startPos());
+ offsetList.append(item->endPos());
+ selection.at(i)->setSelected(true);
+ }
+ if (selection.at(i)->type() == GROUPWIDGET) {
+ QList<QGraphicsItem *> children = selection.at(i)->childItems();
+ for (int j = 0; j < children.count(); j++) {
+ AbstractClipItem *item = static_cast<AbstractClipItem *>(children.at(j));
+ offsetList.append(item->startPos());
+ offsetList.append(item->endPos());
+ }
selection.at(i)->setSelected(true);
}
}
+
+ if (!offsetList.isEmpty()) {
+ qSort(offsetList);
+ QList <GenTime> cleandOffsetList;
+ GenTime startOffset = offsetList.takeFirst();
+ for (int k = 0; k < offsetList.size(); k++) {
+ GenTime newoffset = offsetList.at(k) - startOffset;
+ if (newoffset != GenTime() && !cleandOffsetList.contains(newoffset)) {
+ cleandOffsetList.append(newoffset);
+ }
+ }
+ updateSnapPoints(NULL, cleandOffsetList, true);
+ }
groupSelectedItems(true);
m_operationMode = SPACER;
} else setCursorPos((int)(mapToScene(event->x(), 0).x()));
QDialog d(parentWidget());
Ui::KeyFrameDialog_UI view;
view.setupUi(&d);
- view.kfr_position->setText(m_document->timecode().getTimecode(GenTime(m_dragItem->selectedKeyFramePos(), m_document->fps()) - m_dragItem->cropStart(), m_document->fps()));
+ view.kfr_position->setText(m_document->timecode().getTimecode(GenTime(m_dragItem->selectedKeyFramePos(), m_document->fps()) - m_dragItem->cropStart()));
view.kfr_value->setValue(m_dragItem->selectedKeyFrameValue());
view.kfr_value->setFocus();
if (d.exec() == QDialog::Accepted) {
- int pos = m_document->timecode().getFrameCount(view.kfr_position->text(), m_document->fps());
+ int pos = m_document->timecode().getFrameCount(view.kfr_position->text());
m_dragItem->updateKeyFramePos(GenTime(pos, m_document->fps()) + m_dragItem->cropStart(), (double) view.kfr_value->value() * m_dragItem->keyFrameFactor());
ClipItem *item = (ClipItem *)m_dragItem;
QString previous = item->keyframes(item->selectedEffectIndex());
m_selectionGroup = new AbstractGroupItem(m_document->fps());
QPoint pos;
DocClipBase *clip = m_document->getBaseClip(list.at(0));
- if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0);
+ if (clip == NULL) {
+ kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0);
+ return;
+ }
ItemInfo info;
info.startPos = GenTime();
info.cropStart = GenTime(list.at(1).toInt(), m_document->fps());
QList <GenTime> offsetList;
for (int i = 0; i < ids.size(); ++i) {
DocClipBase *clip = m_document->getBaseClip(ids.at(i));
- if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i);
+ if (clip == NULL) {
+ kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i);
+ return;
+ }
ItemInfo info;
info.startPos = start;
info.endPos = info.startPos + clip->duration();
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
if (clip) {
-
// Special case: speed effect
if (effect.attribute("id") == "speed") {
ItemInfo info = clip->info();
return;
}
-
-
-
EffectsParameterList effectParams = clip->getEffectArgs(effect);
if (effect.attribute("tag") == "ladspa") {
// Update the ladspa affect file
void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos)
{
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
- if (clip) {
- m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos);
+ if (clip && !clip->effectAt(newPos - 1).isNull() && !clip->effectAt(oldPos - 1).isNull()) {
QDomElement act = clip->effectAt(newPos - 1).cloneNode().toElement();
QDomElement before = clip->effectAt(oldPos - 1).cloneNode().toElement();
clip->setEffectAt(oldPos - 1, act);
clip->setEffectAt(newPos - 1, before);
+ m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos);
emit clipItemSelected(clip, newPos - 1);
- }
- setDocumentModified();
+ setDocumentModified();
+ } else emit displayMessage(i18n("Cannot move effect"), ErrorMessage);
}
void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool disable)
{
- QDomElement effect = clip->effectAt(effectPos);
+ QDomElement effect = clip->effectAt(effectPos).cloneNode().toElement();
QDomElement oldEffect = effect.cloneNode().toElement();
-
if (effect.attribute("id") == "speed") {
if (clip) {
ItemInfo info = clip->info();
- effect.setAttribute("disabled", disable);
+ effect.setAttribute("disabled", (int) disable);
if (disable) doChangeClipSpeed(info, 1.0, clip->speed(), 1, clip->baseClip()->getId());
else {
double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0;
return;
}
}
- effect.setAttribute("disabled", disable);
+ effect.setAttribute("disabled", (int) disable);
EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true);
m_commandStack->push(command);
setDocumentModified();;
{
if (cut) {
// cut clip
- ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track);
+ ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
if (!item || cutTime >= item->endPos() || cutTime <= item->startPos()) {
emit displayMessage(i18n("Cannot find clip to cut"), ErrorMessage);
kDebug() << "///////// ERROR CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25);
int tracknumber = m_document->tracksCount() - info.track - 1;
bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
if (isLocked) item->setItemLocked(true);
+ ItemInfo clipInfo = info;
+ clipInfo.track = m_document->tracksCount() - item->track();
+ if (m_document->renderer()->mltInsertClip(clipInfo, item->xml(), item->baseClip()->producer(item->track())) == -1) {
+ emit displayMessage(i18n("Cannot insert clip in timeline"), ErrorMessage);
+ }
if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) {
// add transparency transition
QDomElement trans = MainWindow::transitions.getEffectByTag("composite", "composite").cloneNode().toElement();
new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand);
}
- info.track = m_document->tracksCount() - item->track();
- m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track()));
item->setSelected(true);
}
m_commandStack->push(addCommand);
EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), newPos, m_dragGuide->label(), false);
m_commandStack->push(command);
m_dragGuide->updateGuide(GenTime(m_dragGuide->pos().x(), m_document->fps()));
+ qSort(m_guides.begin(), m_guides.end(), sortGuidesList);
m_document->syncGuides(m_guides);
}
m_dragGuide = NULL;
ClipItem * item = (ClipItem *) m_dragItem;
int ix = item->hasEffect("volume", "fadein");
if (ix != -1) {
- QDomElement oldeffect = item->effectAt(ix);
+ QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement();
int start = item->cropStart().frames(m_document->fps());
int end = item->fadeIn();
if (end == 0) {
}
ix = item->hasEffect("volume", "fade_from_black");
if (ix != -1) {
- QDomElement oldeffect = item->effectAt(ix);
+ QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement();
int start = item->cropStart().frames(m_document->fps());
int end = item->fadeIn();
if (end == 0) {
ClipItem * item = (ClipItem *) m_dragItem;
int ix = item->hasEffect("volume", "fadeout");
if (ix != -1) {
- QDomElement oldeffect = item->effectAt(ix);
+ QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement();
int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps());
int start = item->fadeOut();
if (start == 0) {
}
ix = item->hasEffect("brightness", "fade_to_black");
if (ix != -1) {
- QDomElement oldeffect = item->effectAt(ix);
+ QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement();
int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps());
int start = item->fadeOut();
if (start == 0) {
ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track)
{
- int framepos = (int)(pos.frames(m_document->fps()));
- return getClipItemAt(framepos, track);
+ return getClipItemAt((int) pos.frames(m_document->fps()), track);
}
Transition *CustomTrackView::getTransitionItemAt(int pos, int track)
void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end)
{
if (m_selectionGroup) resetSelectionGroup(false);
- ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()) + 1, start.track);
+ ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()), start.track);
if (!item) {
emit displayMessage(i18n("Cannot move clip at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage);
kDebug() << "---------------- ERROR, CANNOT find clip to move at.. ";
viewport()->update();
}
-bool sortGuidesList(const Guide *g1 , const Guide *g2)
-{
- return (*g1).position() < (*g2).position();
-}
-
int CustomTrackView::hasGuide(int pos, int offset)
{
for (int i = 0; i < m_guides.count(); i++) {
projects / kdenlive / blobdiff