Merge branch 'master' of git://anongit.kde.org/kdenlive

[kdenlive] / src / jogaction.cpp

diff --git a/src/jogaction.cpp b/src/jogaction.cpp
index 646cc9ffc99dba40101bffa5336b8bec7fe18327..9453556ff78ce30a7403f6b223eaec7781a00723 100644 (file)
--- a/src/jogaction.cpp
+++ b/src/jogaction.cpp
@@ -24,7 +24,8 @@
 #include <klocalizedstring.h>
 
 // TODO(fleury): this should probably be a user configuration parameter (at least the max speed).
-const double SPEEDS[] = {0.0, 0.5, 1.0, 2.0, 4.0, 8.0, 16.0, 32.0};
+//const double SPEEDS[] = {0.0, 0.5, 1.0, 2.0, 4.0, 8.0, 16.0, 32.0};
+const double SPEEDS[] = {0.0, 1.0, 2.0, 4.0, 5.0, 8.0, 16.0, 60.0};
 const size_t SPEEDS_SIZE = sizeof(SPEEDS) / sizeof(double);
 
 JogShuttleAction::JogShuttleAction (const JogShuttle* jogShuttle, const QStringList& actionMap, QObject * parent)
@@ -74,7 +75,7 @@ void JogShuttleAction::slotShuttlePos(int shuttle_pos)
 
 void JogShuttleAction::slotButton(int button_id)
 {
-    if (button_id >= m_actionMap.size() || m_actionMap[button_id] == "") {
+    if (button_id >= m_actionMap.size() || m_actionMap[button_id].isEmpty()) {
         // TODO(fleury): Shoudl this go to the status bar to inform the user ?
         fprintf(stderr, "Button %d has no action\n", button_id);
         return;