backport commit from Dan Dennedy:

[kdenlive] / src / changespeedcommand.cpp

diff --git a/src/changespeedcommand.cpp b/src/changespeedcommand.cpp
index 154b96d15ad703e28602ec61c27831b2ab184848..badcb9b0e075954e11a556fd46d1008f3c00c4c2 100644 (file)
--- a/src/changespeedcommand.cpp
+++ b/src/changespeedcommand.cpp
@@ -17,26 +17,27 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "changespeedcommand.h"
 #include "customtrackview.h"
 
-ChangeSpeedCommand::ChangeSpeedCommand(CustomTrackView *view, ItemInfo info, double old_speed, double new_speed, int clipId, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_clipInfo(info), m_old_speed(old_speed), m_new_speed(new_speed), m_clipId(clipId), m_doIt(doIt) {
+#include <KLocale>
+
+ChangeSpeedCommand::ChangeSpeedCommand(CustomTrackView *view, ItemInfo info, double old_speed, double new_speed, const QString &clipId, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_clipInfo(info), m_old_speed(old_speed), m_new_speed(new_speed), m_clipId(clipId), m_doIt(doIt) {
     setText(i18n("Adjust clip length"));
 }
 
 
 // virtual
 void ChangeSpeedCommand::undo() {
-    m_view->doChangeClipSpeed(m_clipInfo, m_old_speed, m_clipId);
+    m_view->doChangeClipSpeed(m_clipInfo, m_old_speed, m_new_speed, m_clipId);
 }
 // virtual
 void ChangeSpeedCommand::redo() {
     if (m_doIt) {
-        m_view->doChangeClipSpeed(m_clipInfo, m_new_speed, m_clipId);
+        m_view->doChangeClipSpeed(m_clipInfo, m_new_speed, m_old_speed, m_clipId);
     }
     m_doIt = true;
 }
 
-#include "changespeedcommand.moc"
+