[Traverso-commit] traverso/src/traverso CorrelationMeterWidget.cp...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       08/02/15 16:53:19

Modified files:
        src/traverso   : CorrelationMeterWidget.cpp 
                         CorrelationMeterWidget.h 
                         SpectralMeterWidget.cpp SpectralMeterWidget.h 

Log message:
        * and again, but now the proper way :)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CorrelationMeterWidget.cpp?cvsroot=traverso&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CorrelationMeterWidget.h?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/SpectralMeterWidget.cpp?cvsroot=traverso&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/SpectralMeterWidget.h?cvsroot=traverso&r1=1.25&r2=1.26

Patches:
Index: CorrelationMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CorrelationMeterWidget.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- CorrelationMeterWidget.cpp  15 Feb 2008 16:47:22 -0000      1.33
+++ CorrelationMeterWidget.cpp  15 Feb 2008 16:53:19 -0000      1.34
@@ -127,6 +127,7 @@
        // Connections to core:
        connect(&pm(), SIGNAL(projectLoaded(Project*)), this, 
SLOT(set_project(Project*)));
        connect(&timer, SIGNAL(timeout()), this, SLOT(update_data()));
+       connect(&m_delayTimer, SIGNAL(timeout()), this, SLOT(delay_timeout()));
 }
 
 CorrelationMeterView::~CorrelationMeterView()
@@ -311,18 +312,17 @@
 void CorrelationMeterView::transport_started()
 {
        timer.start(40);
+       m_delayTimer.stop();
 }
 
 void CorrelationMeterView::transport_stopped()
 {
-       QTimer::singleShot(STOP_DELAY, this, SLOT(delay_timeout()));
+       m_delayTimer.start(STOP_DELAY);
 }
 
 void CorrelationMeterView::delay_timeout()
 {
-       if (!m_sheet->is_transport_rolling()) {
                timer.stop();
-       }
 }
 
 void CorrelationMeterView::save_configuration()

Index: CorrelationMeterWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CorrelationMeterWidget.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- CorrelationMeterWidget.h    15 Feb 2008 14:15:43 -0000      1.13
+++ CorrelationMeterWidget.h    15 Feb 2008 16:53:19 -0000      1.14
@@ -76,6 +76,7 @@
 private:
        CorrelationMeterWidget* m_widget;
        QTimer          timer;
+       QTimer          m_delayTimer;
        float           coeff;
        float           direction;
        CorrelationMeter*       m_meter;

Index: SpectralMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/SpectralMeterWidget.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- SpectralMeterWidget.cpp     15 Feb 2008 16:47:22 -0000      1.54
+++ SpectralMeterWidget.cpp     15 Feb 2008 16:53:19 -0000      1.55
@@ -177,6 +177,7 @@
        // Connections to core:
        connect(&pm(), SIGNAL(projectLoaded(Project*)), this, 
SLOT(set_project(Project*)));
        connect(&timer, SIGNAL(timeout()), this, SLOT(update_data()));
+       connect(&m_delayTimer, SIGNAL(timeout()), this, SLOT(delay_timeout()));
 }
 
 SpectralMeterView::~SpectralMeterView()
@@ -616,18 +617,17 @@
        // restarts the average curve
        sample_weight = 1;
        timer.start(UPDATE_INTERVAL);
+       m_delayTimer.stop();
 }
 
 void SpectralMeterView::transfer_stopped()
 {
-       QTimer::singleShot(STOP_DELAY, this, SLOT(delay_timeout()));
+       m_delayTimer.start(STOP_DELAY);
 }
 
 void SpectralMeterView::delay_timeout()
 {
-       if (!m_sheet->is_transport_rolling()) {
                timer.stop();
-       }
 }
 
 Command* SpectralMeterView::set_mode()

Index: SpectralMeterWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/SpectralMeterWidget.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- SpectralMeterWidget.h       15 Feb 2008 14:23:34 -0000      1.25
+++ SpectralMeterWidget.h       15 Feb 2008 16:53:19 -0000      1.26
@@ -106,6 +106,7 @@
        Project*        m_project;
        Sheet*          m_sheet;
        QTimer          timer;
+       QTimer          m_delayTimer;
        QVector<float>  specl;
        QVector<float>  specr;
        QVector<float>  m_spectrum;