[Traverso-commit] traverso/src/traverso Interface.cpp widgets/Tra...

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    08/05/14 17:49:28

Modified files:
        src/traverso   : Interface.cpp 
        src/traverso/widgets: TransportConsoleWidget.cpp 
                              TransportConsoleWidget.h 

Log message:
        * allow 'hopping' from snap pos to snap pos when skipping to the left 
during playback

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.138&r2=1.139
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/TransportConsoleWidget.cpp?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/TransportConsoleWidget.h?cvsroot=traverso&r1=1.1&r2=1.2

Patches:
Index: Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- Interface.cpp       14 May 2008 17:22:26 -0000      1.138
+++ Interface.cpp       14 May 2008 17:49:26 -0000      1.139
@@ -169,12 +169,15 @@
        transportDW->hide();
        
        m_sysinfo = new SysInfoToolBar(this);
+       m_sysinfo->setObjectName("System Info Toolbar");
        addToolBar(Qt::BottomToolBarArea, m_sysinfo);
        
        m_projectToolBar = new QToolBar(this);
+       m_projectToolBar->setObjectName("Project Toolbar");
        addToolBar(m_projectToolBar);
        
        m_editToolBar = new QToolBar(this);
+       m_editToolBar->setObjectName("Edit Toolbar");
        addToolBar(m_editToolBar);
 
        // Some default values.

Index: widgets/TransportConsoleWidget.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/widgets/TransportConsoleWidget.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- widgets/TransportConsoleWidget.cpp  14 May 2008 17:22:32 -0000      1.2
+++ widgets/TransportConsoleWidget.cpp  14 May 2008 17:49:27 -0000      1.3
@@ -22,7 +22,6 @@
 #include "TransportConsoleWidget.h"
 #include "libtraversocore.h"
 #include "Themer.h"
-#include "defines.h"
 
 #include <QPixmap>
 #include <QGridLayout>
@@ -103,6 +102,9 @@
        m_layout->addWidget(buttonToRight, 1, 4, 1, 1);
        m_layout->addWidget(buttonToEnd,   1, 5, 1, 1);
 
+       m_lastSnapPosition = TimeRef(0.0);
+       m_skipTimer.setSingleShot(true);
+
        connect(&pm(), SIGNAL(projectLoaded(Project*)), this, 
SLOT(set_project(Project*)));
        connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(update_label()));
        place_label();
@@ -147,12 +149,23 @@
        m_sheet->set_work_at((TimeRef)0.0);
 }
 
+// the timer is used to allow 'hopping' to the left from snap position to snap 
position
+// even during playback.
 void TransportConsoleWidget::to_left()
 {
-       SnapList* slist = m_sheet->get_snap_list();
        TimeRef p = m_sheet->get_transport_location();
+
+       if (m_skipTimer.isActive()) 
+       {
+               p = m_lastSnapPosition;
+       }
+
+       SnapList* slist = m_sheet->get_snap_list();
        TimeRef newpos = slist->prev_snap_pos(p);
        m_sheet->set_transport_pos(newpos);
+
+       m_lastSnapPosition = newpos;
+       m_skipTimer.start(500);
 }
 
 void TransportConsoleWidget::rec_toggled()

Index: widgets/TransportConsoleWidget.h
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/widgets/TransportConsoleWidget.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- widgets/TransportConsoleWidget.h    13 May 2008 23:24:35 -0000      1.1
+++ widgets/TransportConsoleWidget.h    14 May 2008 17:49:28 -0000      1.2
@@ -25,8 +25,9 @@
 #include <QWidget>
 #include <QGridLayout>
 #include <QLabel>
+#include <QTimer>
 
-#include "InfoWidgets.h"
+#include "defines.h"
 
 class Project;
 class Sheet;
@@ -54,6 +55,8 @@
        QAction*        m_toRightAction;
        QLabel*         m_label;
        QTimer          m_updateTimer;
+       QTimer          m_skipTimer;
+       TimeRef         m_lastSnapPosition;
 
        void place_label();