From 3cf14dfa3d663cb9580b1cad48108f642f5fcaf8 Mon Sep 17 00:00:00 2001 From: Till Theato Date: Sun, 2 Oct 2011 12:01:34 +0000 Subject: [PATCH] Don't allow adding the speed effect to tracks. svn path=/trunk/kdenlive/; revision=5937 --- src/customtrackview.cpp | 5 +++++ src/headertrack.cpp | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index ee7c5bd2..188d18e7 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -1640,6 +1640,11 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { if (pos < GenTime()) { // Add track effect + if (effect.attribute("id") == "speed") { + // TODO: uncomment after 0.8.2 release + // emit displayMessage(i18n("Cannot add speed effect to track")); + return; + } clearSelection(); m_document->addTrackEffect(track - 1, effect); m_document->renderer()->mltAddTrackEffect(track, getEffectArgs(effect)); diff --git a/src/headertrack.cpp b/src/headertrack.cpp index 5dbd39f6..b806a01c 100644 --- a/src/headertrack.cpp +++ b/src/headertrack.cpp @@ -168,8 +168,18 @@ void HeaderTrack::dropEvent(QDropEvent * event) //virtual void HeaderTrack::dragEnterEvent(QDragEnterEvent *event) { - if (buttonLock->isChecked()) event->setAccepted(false); - else event->setAccepted(event->mimeData()->hasFormat("kdenlive/effectslist")); + if (buttonLock->isChecked()) { + event->setAccepted(false); + } else { + if (event->mimeData()->hasFormat("kdenlive/effectslist")) { + const QString effects = QString::fromUtf8(event->mimeData()->data("kdenlive/effectslist")); + QDomDocument doc; + doc.setContent(effects, true); + if (doc.documentElement().attribute("id") != "speed") { + event->setAccepted(true); + } + } + } } void HeaderTrack::setSelectedIndex(int ix) -- 2.39.2