else
getClipAvailableSpace(item, minimum, maximum);
- ClipDurationDialog d(item, m_document->timecode(), minimum, maximum, this);
- if (d.exec() == QDialog::Accepted) {
+ QPointer<ClipDurationDialog> d = new ClipDurationDialog(item,
+ m_document->timecode(), minimum, maximum, this);
+ if (d->exec() == QDialog::Accepted) {
ItemInfo clipInfo = item->info();
ItemInfo startInfo = clipInfo;
if (item->type() == TRANSITIONWIDGET) {
// move & resize transition
- clipInfo.startPos = d.startPos();
- clipInfo.endPos = clipInfo.startPos + d.duration();
+ clipInfo.startPos = d->startPos();
+ clipInfo.endPos = clipInfo.startPos + d->duration();
clipInfo.track = item->track();
MoveTransitionCommand *command = new MoveTransitionCommand(this, startInfo, clipInfo, true);
updateTrackDuration(clipInfo.track, command);
ClipItem *clip = static_cast<ClipItem *>(item);
QUndoCommand *moveCommand = new QUndoCommand();
moveCommand->setText(i18n("Edit clip"));
- if (d.duration() < item->cropDuration() || d.cropStart() != clipInfo.cropStart) {
+ if (d->duration() < item->cropDuration() || d->cropStart() != clipInfo.cropStart) {
// duration was reduced, so process it first
- clipInfo.endPos = clipInfo.startPos + d.duration();
- clipInfo.cropStart = d.cropStart();
+ clipInfo.endPos = clipInfo.startPos + d->duration();
+ clipInfo.cropStart = d->cropStart();
resizeClip(startInfo, clipInfo);
new ResizeClipCommand(this, startInfo, clipInfo, false, true, moveCommand);
new ResizeClipCommand(this, startInfo, clipInfo, false, true, moveCommand);
}
- if (d.startPos() != clipInfo.startPos) {
+ if (d->startPos() != clipInfo.startPos) {
startInfo = clipInfo;
- clipInfo.startPos = d.startPos();
+ clipInfo.startPos = d->startPos();
clipInfo.endPos = item->endPos() + (clipInfo.startPos - startInfo.startPos);
new MoveClipCommand(this, startInfo, clipInfo, true, moveCommand);
}
- if (d.duration() > item->cropDuration()) {
+ if (d->duration() > item->cropDuration()) {
// duration was increased, so process it after move
startInfo = clipInfo;
- clipInfo.endPos = clipInfo.startPos + d.duration();
- clipInfo.cropStart = d.cropStart();
+ clipInfo.endPos = clipInfo.startPos + d->duration();
+ clipInfo.cropStart = d->cropStart();
resizeClip(startInfo, clipInfo);
new ResizeClipCommand(this, startInfo, clipInfo, false, true, moveCommand);
updateTrackDuration(clipInfo.track, moveCommand);
m_commandStack->push(moveCommand);
}
+ delete d;
}
} else {
emit displayMessage(i18n("Item is locked"), ErrorMessage);
QList<QGraphicsItem *> itemList = group->childItems();
QUndoCommand *effectCommand = new QUndoCommand();
QString effectName;
+ int offset = effect.attribute("clipstart").toInt();
QDomElement namenode = effect.firstChildElement("name");
if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data());
else effectName = i18n("effect");
subeffect.setAttribute("kdenlive_info", effectInfo.toString());
}
}
- processEffect(item, subeffect, effectCommand);
+ processEffect(item, subeffect, offset, effectCommand);
}
}
else {
- processEffect(item, effect, effectCommand);
+ processEffect(item, effect, offset, effectCommand);
}
}
}
QList<QGraphicsItem *> itemList;
QUndoCommand *effectCommand = new QUndoCommand();
QString effectName;
+
+ int offset = effect.attribute("clipstart").toInt();
if (effect.tagName() == "effectgroup") {
effectName = effect.attribute("name");
} else {
subeffect.setAttribute("kdenlive_info", effectInfo.toString());
}
}
- processEffect(item, subeffect, effectCommand);
+ processEffect(item, subeffect, offset, effectCommand);
}
}
- else processEffect(item, effect, effectCommand);
+ else processEffect(item, effect, offset, effectCommand);
}
}
if (effectCommand->childCount() > 0) {
if (!clip->isSelected()) {
clearSelection(false);
clip->setSelected(true);
+ m_dragItem = clip;
emit clipItemSelected(clip);
}
break;
} else delete effectCommand;
}
-void CustomTrackView::processEffect(ClipItem *item, QDomElement effect, QUndoCommand *effectCommand)
+void CustomTrackView::processEffect(ClipItem *item, QDomElement effect, int offset, QUndoCommand *effectCommand)
{
if (effect.attribute("type") == "audio") {
// Don't add audio effects on video clips
}
if (effect.attribute("id") == "freeze" && m_cursorPos > item->startPos().frames(m_document->fps()) && m_cursorPos < item->endPos().frames(m_document->fps())) {
- item->initEffect(effect, m_cursorPos - item->startPos().frames(m_document->fps()));
+ item->initEffect(effect, m_cursorPos - item->startPos().frames(m_document->fps()), offset);
} else {
- item->initEffect(effect);
+ item->initEffect(effect, 0, offset);
}
new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand);
}
if (effect.attribute("tag") == "volume" || effect.attribute("tag") == "brightness") {
// A fade effect was modified, update the clip
if (effect.attribute("id") == "fadein" || effect.attribute("id") == "fade_from_black") {
- int pos = effectParams.paramValue("out").toInt() - effectParams.paramValue("in").toInt();
+ int pos = EffectsList::parameter(effect, "out").toInt() - EffectsList::parameter(effect, "in").toInt();
clip->setFadeIn(pos);
}
if (effect.attribute("id") == "fadeout" || effect.attribute("id") == "fade_to_black") {
- int pos = effectParams.paramValue("out").toInt() - effectParams.paramValue("in").toInt();
+ int pos = EffectsList::parameter(effect, "out").toInt() - EffectsList::parameter(effect, "in").toInt();
clip->setFadeOut(pos);
}
}
if (m_menuPosition.isNull()) {
pos = GenTime(cursorPos(), m_document->fps());
- TrackDialog d(m_document, parentWidget());
- d.comboTracks->setCurrentIndex(m_selectedTrack);
- d.label->setText(i18n("Track"));
- d.before_select->setHidden(true);
- d.setWindowTitle(i18n("Remove Space"));
- d.video_track->setHidden(true);
- d.audio_track->setHidden(true);
- if (d.exec() != QDialog::Accepted) return;
- track = d.comboTracks->currentIndex();
+ QPointer<TrackDialog> d = new TrackDialog(m_document, parentWidget());
+ d->comboTracks->setCurrentIndex(m_selectedTrack);
+ d->label->setText(i18n("Track"));
+ d->before_select->setHidden(true);
+ d->setWindowTitle(i18n("Remove Space"));
+ d->video_track->setHidden(true);
+ d->audio_track->setHidden(true);
+ if (d->exec() != QDialog::Accepted) {
+ delete d;
+ return;
+ }
+ track = d->comboTracks->currentIndex();
+ delete d;
} else {
pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps());
track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight);
pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps());
track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight) + 1;
}
- SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksList(), this);
- if (d.exec() != QDialog::Accepted) return;
- GenTime spaceDuration = d.selectedDuration();
- track = d.selectedTrack();
+ QPointer<SpacerDialog> d = new SpacerDialog(GenTime(65, m_document->fps()),
+ m_document->timecode(), track, m_document->tracksList(), this);
+ if (d->exec() != QDialog::Accepted) {
+ delete d;
+ return;
+ }
+ GenTime spaceDuration = d->selectedDuration();
+ track = d->selectedTrack();
+ delete d;
QList<QGraphicsItem *> items;
if (track >= 0) {
}
}
} else if (m_operationMode == FADEOUT) {
- // resize fade in effect
+ // resize fade out effect
ClipItem * item = static_cast <ClipItem *>(m_dragItem);
int ix = item->hasEffect("volume", "fadeout");
int ix2 = item->hasEffect("", "fade_to_black");
// add video fade
effect = MainWindow::videoEffects.getEffectByTag("", "fade_to_black").cloneNode().toElement();
} else effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout").cloneNode().toElement();
- EffectsList::setParameter(effect, "in", QString::number(item->fadeOut()));
- EffectsList::setParameter(effect, "out", QString::number(0));
+ int end = (item->cropDuration() + 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());
}
if (ix2 != -1) {
goMenu->clear();
double fps = m_document->fps();
for (int i = 0; i < m_guides.count(); i++) {
- act = goMenu->addAction(m_guides.at(i)->label() + "/" + Timecode::getStringTimecode(m_guides.at(i)->position().frames(fps), fps));
+ act = goMenu->addAction(m_guides.at(i)->label() + '/' + Timecode::getStringTimecode(m_guides.at(i)->position().frames(fps), fps));
act->setData(m_guides.at(i)->position().frames(m_document->fps()));
}
goMenu->setEnabled(!m_guides.isEmpty());
{
CommentedTime marker(GenTime(m_cursorPos, m_document->fps()), i18n("Guide"));
if (dialog) {
- MarkerDialog d(NULL, marker, m_document->timecode(), i18n("Add Guide"), this);
- if (d.exec() != QDialog::Accepted) return;
- marker = d.newMarker();
-
+ QPointer<MarkerDialog> d = new MarkerDialog(NULL, marker,
+ m_document->timecode(), i18n("Add Guide"), this);
+ if (d->exec() != QDialog::Accepted) {
+ delete d;
+ return;
+ }
+ marker = d->newMarker();
+ delete d;
} else {
marker.setComment(m_document->timecode().getDisplayTimecodeFromFrames(m_cursorPos, false));
}
void CustomTrackView::slotEditGuide(CommentedTime guide)
{
- MarkerDialog d(NULL, guide, m_document->timecode(), i18n("Edit Guide"), this);
- if (d.exec() == QDialog::Accepted) {
- EditGuideCommand *command = new EditGuideCommand(this, guide.time(), guide.comment(), d.newMarker().time(), d.newMarker().comment(), true);
+ QPointer<MarkerDialog> d = new MarkerDialog(NULL, guide, m_document->timecode(), i18n("Edit Guide"), this);
+ if (d->exec() == QDialog::Accepted) {
+ EditGuideCommand *command = new EditGuideCommand(this, guide.time(), guide.comment(), d->newMarker().time(), d->newMarker().comment(), true);
m_commandStack->push(command);
}
+ delete d;
}
{
if (m_dragGuide == NULL) return;
CommentedTime guide = m_dragGuide->info();
- MarkerDialog d(NULL, guide, m_document->timecode(), i18n("Edit Guide"), this);
- if (d.exec() == QDialog::Accepted) {
- EditGuideCommand *command = new EditGuideCommand(this, guide.time(), guide.comment(), d.newMarker().time(), d.newMarker().comment(), true);
+ QPointer<MarkerDialog> d = new MarkerDialog(NULL, guide,
+ m_document->timecode(), i18n("Edit Guide"), this);
+ if (d->exec() == QDialog::Accepted) {
+ EditGuideCommand *command = new EditGuideCommand(this, guide.time(), guide.comment(), d->newMarker().time(), d->newMarker().comment(), true);
m_commandStack->push(command);
}
+ delete d;
}
void CustomTrackView::slotDeleteGuide(int guidePos)
if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) {
QString def = e.attribute("default");
// Effect has a keyframe type parameter, we need to adjust the values
- QStringList keys = e.attribute("keyframes").split(";", QString::SkipEmptyParts);
+ QStringList keys = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
QStringList newKeyFrames;
foreach(const QString &str, keys) {
int pos = str.section(':', 0, 0).toInt();
void CustomTrackView::slotInsertTrack(int ix)
{
- TrackDialog d(m_document, parentWidget());
- d.comboTracks->setCurrentIndex(ix);
- d.label->setText(i18n("Insert track"));
- d.setWindowTitle(i18n("Insert New Track"));
+ QPointer<TrackDialog> d = new TrackDialog(m_document, parentWidget());
+ d->comboTracks->setCurrentIndex(ix);
+ d->label->setText(i18n("Insert track"));
+ d->setWindowTitle(i18n("Insert New Track"));
- if (d.exec() == QDialog::Accepted) {
- ix = d.comboTracks->currentIndex();
- if (d.before_select->currentIndex() == 1)
+ if (d->exec() == QDialog::Accepted) {
+ ix = d->comboTracks->currentIndex();
+ if (d->before_select->currentIndex() == 1)
ix++;
TrackInfo info;
info.duration = 0;
info.isMute = false;
info.isLocked = false;
info.effectsList = EffectsList(true);
- if (d.video_track->isChecked()) {
+ if (d->video_track->isChecked()) {
info.type = VIDEOTRACK;
info.isBlind = false;
} else {
m_commandStack->push(addTrack);
setDocumentModified();
}
+ delete d;
}
void CustomTrackView::slotDeleteTrack(int ix)
{
if (m_document->tracksCount() < 2) return;
- TrackDialog d(m_document, parentWidget());
- d.comboTracks->setCurrentIndex(ix);
- d.label->setText(i18n("Delete track"));
- d.before_select->setHidden(true);
- d.setWindowTitle(i18n("Delete Track"));
- d.video_track->setHidden(true);
- d.audio_track->setHidden(true);
- if (d.exec() == QDialog::Accepted) {
- ix = d.comboTracks->currentIndex();
+ QPointer<TrackDialog> d = new TrackDialog(m_document, parentWidget());
+ d->comboTracks->setCurrentIndex(ix);
+ d->label->setText(i18n("Delete track"));
+ d->before_select->setHidden(true);
+ d->setWindowTitle(i18n("Delete Track"));
+ d->video_track->setHidden(true);
+ d->audio_track->setHidden(true);
+ if (d->exec() == QDialog::Accepted) {
+ ix = d->comboTracks->currentIndex();
TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
deleteTimelineTrack(ix, info);
setDocumentModified();
/*AddTrackCommand* command = new AddTrackCommand(this, ix, info, false);
m_commandStack->push(command);*/
}
+ delete d;
}
void CustomTrackView::slotConfigTracks(int ix)
{
- TracksConfigDialog d(m_document, ix, parentWidget());
- if (d.exec() == QDialog::Accepted) {
- ConfigTracksCommand *configTracks = new ConfigTracksCommand(this, m_document->tracksList(), d.tracksList());
+ QPointer<TracksConfigDialog> d = new TracksConfigDialog(m_document,
+ ix, parentWidget());
+ if (d->exec() == QDialog::Accepted) {
+ ConfigTracksCommand *configTracks = new ConfigTracksCommand(this, m_document->tracksList(), d->tracksList());
m_commandStack->push(configTracks);
- QList <int> toDelete = d.deletedTracks();
+ QList <int> toDelete = d->deletedTracks();
for (int i = 0; i < toDelete.count(); ++i) {
TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - toDelete.at(i) + i - 1);
deleteTimelineTrack(toDelete.at(i) - i, info);
}
setDocumentModified();
}
+ delete d;
}
void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo)
parameters.addParam("_sync_in_out", "1");
}
if (e.attribute("type") == "simplekeyframe") {
- QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts);
+ QStringList values = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
double factor = e.attribute("factor", "1").toDouble();
double offset = e.attribute("offset", "0").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() - offset) / factor;
- values[j] = pos + "=" + locale.toString(val);
+ values[j] = pos + '=' + locale.toString(val);
}
// kDebug() << "/ / / /SENDING KEYFR:" << values;
parameters.addParam(paramname, values.join(";"));
projects / kdenlive / blobdiff