X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faddtimelineclipcommand.cpp;h=394a7aff07bfcd0030fae4831001804ff8b3ab5a;hb=a7fe0606ce9ccd258dbeb08086bdc4c013c9e73e;hp=2401fdf3c78ac692b70f04b8d1fa168bc25bf99a;hpb=2a223cff6e45c560c28857b72c0cb7e584f9a4ef;p=kdenlive diff --git a/src/addtimelineclipcommand.cpp b/src/addtimelineclipcommand.cpp index 2401fdf3..394a7aff 100644 --- a/src/addtimelineclipcommand.cpp +++ b/src/addtimelineclipcommand.cpp @@ -17,12 +17,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "addtimelineclipcommand.h" +#include "customtrackview.h" + +#include -AddTimelineClipCommand::AddTimelineClipCommand(CustomTrackView *view, QDomElement xml, int clipId, int track, int startpos, QRectF rect, int duration, bool doIt, bool doRemove) - : m_view(view), m_xml(xml), m_clipId(clipId), m_clipTrack(track), m_clipPos(startpos), m_clipRect(rect), m_clipDuration(duration), m_doIt(doIt), m_remove(doRemove) { +AddTimelineClipCommand::AddTimelineClipCommand(CustomTrackView *view, QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects, bool doIt, bool doRemove, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_xml(xml), m_clipId(clipId), m_clipInfo(info), m_effects(effects), m_doIt(doIt), m_remove(doRemove) { if (!m_remove) setText(i18n("Add timeline clip")); else setText(i18n("Delete timeline clip")); } @@ -30,16 +31,16 @@ AddTimelineClipCommand::AddTimelineClipCommand(CustomTrackView *view, QDomElemen // virtual void AddTimelineClipCommand::undo() { - if (!m_remove) m_view->deleteClip(m_clipTrack, m_clipPos, m_clipRect); - else m_view->addClip(m_xml, m_clipId, m_clipTrack, m_clipPos, m_clipRect, m_clipDuration); + if (!m_remove) m_view->deleteClip(m_clipInfo); + else m_view->addClip(m_xml, m_clipId, m_clipInfo, m_effects); } // virtual void AddTimelineClipCommand::redo() { if (m_doIt) { - if (!m_remove) m_view->addClip(m_xml, m_clipId, m_clipTrack, m_clipPos, m_clipRect, m_clipDuration); - else m_view->deleteClip(m_clipTrack, m_clipPos, m_clipRect); + if (!m_remove) m_view->addClip(m_xml, m_clipId, m_clipInfo, m_effects); + else m_view->deleteClip(m_clipInfo); } m_doIt = true; } -#include "addtimelineclipcommand.moc" +