[Traverso-commit] traverso/src core/AudioClip.cpp core/Sheet.cpp ...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       09/02/07 17:41:26

Modified files:
        src/core       : AudioClip.cpp Sheet.cpp Sheet.h 
        src/sheetcanvas: Cursors.cpp SheetView.cpp 
        src/traverso   : Interface.cpp 
        src/traverso/widgets: InfoWidgets.cpp MeterWidget.cpp 

Log message:
        * rename Sheet transferStopped/Started to the more correct names 
transportStopped/Started
        * emit transportStopped when disconnecting a transporting Sheet from 
the audiodevice, the signal won't be emitted from the process() function then.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.167&r2=1.168
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Sheet.cpp?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Sheet.h?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/Cursors.cpp?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/SheetView.cpp?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.158&r2=1.159
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/MeterWidget.cpp?cvsroot=traverso&r1=1.4&r2=1.5

Patches:
Index: core/AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -b -r1.167 -r1.168
--- core/AudioClip.cpp  17 Jan 2009 18:18:02 -0000      1.167
+++ core/AudioClip.cpp  7 Feb 2009 17:41:25 -0000       1.168
@@ -640,7 +640,7 @@
        m_sheet->get_diskio()->register_write_source(m_recorder);
        
        connect(m_recorder, SIGNAL(exportFinished()), this, 
SLOT(finish_write_source()));
-       connect(m_sheet, SIGNAL(transferStopped()), this, 
SLOT(finish_recording()));
+       connect(m_sheet, SIGNAL(transportStopped()), this, 
SLOT(finish_recording()));
        connect(&audiodevice(), SIGNAL(driverParamsChanged()), this, 
SLOT(get_capture_bus()));
 
        return 1;
@@ -785,7 +785,7 @@
        m_recordingStatus = FINISHING_RECORDING;
        m_recorder->set_recording(false);
 
-       disconnect(m_sheet, SIGNAL(transferStopped()), this, 
SLOT(finish_recording()));
+       disconnect(m_sheet, SIGNAL(transportStopped()), this, 
SLOT(finish_recording()));
        disconnect(&audiodevice(), SIGNAL(driverParamsChanged()), this, 
SLOT(get_capture_bus()));
 }
 

Index: core/Sheet.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Sheet.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- core/Sheet.cpp      26 Jan 2009 20:11:42 -0000      1.19
+++ core/Sheet.cpp      7 Feb 2009 17:41:25 -0000       1.20
@@ -164,7 +164,7 @@
        connect (m_diskio, SIGNAL(writeSourceBufferOverRun()), this, 
SLOT(handle_diskio_writebuffer_overrun()));
        connect(&config(), SIGNAL(configChanged()), this, 
SLOT(config_changed()));
        connect(this, SIGNAL(transferStarted()), m_diskio, SLOT(start_io()));
-       connect(this, SIGNAL(transferStopped()), m_diskio, SLOT(stop_io()));
+       connect(this, SIGNAL(transportStopped()), m_diskio, SLOT(stop_io()));
 
        mixdown = gainbuffer = 0;
        m_masterOut = new AudioBus("Master Out", 2);
@@ -311,6 +311,7 @@
        PENTER;
        if (is_transport_rolling()) {
                m_transport = false;
+               emit transportStopped();
        }
        audiodevice().remove_client(m_audiodeviceClient);
 }
@@ -808,7 +809,7 @@
        }
 
        if (m_stopTransport) {
-               RT_THREAD_EMIT(this, 0, transferStopped());
+               RT_THREAD_EMIT(this, 0, transportStopped());
                m_transport = false;
                m_realtimepath = false;
                m_stopTransport = false;
@@ -1304,19 +1305,19 @@
        m_transport = 1;
        
        if (realtime) {
-               RT_THREAD_EMIT(this, 0, transferStarted());
+               RT_THREAD_EMIT(this, 0, transportStarted());
        } else {
-               emit transferStarted();
+               emit transportStarted();
        }
        
-       PMESG("tranport rolling");
+       PMESG("transport rolling");
 }
 
 // RT thread save function
 void Sheet::stop_transport_rolling()
 {
        m_stopTransport = 1;
-       PMESG("tranport stopped");
+       PMESG("transport stopped");
 }
 
 // RT thread save function

Index: core/Sheet.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Sheet.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- core/Sheet.h        7 Nov 2008 10:43:08 -0000       1.8
+++ core/Sheet.h        7 Feb 2009 17:41:25 -0000       1.9
@@ -260,8 +260,8 @@
        void trackRemoved(Track* );
        void trackAdded(Track* );
        void hzoomChanged();
-       void transferStarted();
-       void transferStopped();
+       void transportStarted();
+       void transportStopped();
        void workingPosChanged();
        void transportPosSet();
        void firstVisibleFrameChanged();

Index: sheetcanvas/Cursors.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/Cursors.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- sheetcanvas/Cursors.cpp     2 Feb 2009 20:24:11 -0000       1.6
+++ sheetcanvas/Cursors.cpp     7 Feb 2009 17:41:25 -0000       1.7
@@ -51,8 +51,8 @@
        m_animation.setDuration(ANIME_DURATION);
        m_animation.setCurveShape(QTimeLine::EaseInOutCurve);
        
-       connect(m_sheet, SIGNAL(transferStarted()), this, SLOT(play_start()));
-       connect(m_sheet, SIGNAL(transferStopped()), this, SLOT(play_stop()));
+       connect(m_sheet, SIGNAL(transportStarted()), this, SLOT(play_start()));
+       connect(m_sheet, SIGNAL(transportStopped()), this, SLOT(play_stop()));
        
        connect(&m_playTimer, SIGNAL(timeout()), this, SLOT(update_position()));
        

Index: sheetcanvas/SheetView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/SheetView.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- sheetcanvas/SheetView.cpp   2 Feb 2009 20:25:22 -0000       1.10
+++ sheetcanvas/SheetView.cpp   7 Feb 2009 17:41:26 -0000       1.11
@@ -103,7 +103,7 @@
        m_workCursor = new WorkCursor(this, m_sheet);
        
        connect(m_sheet, SIGNAL(workingPosChanged()), m_workCursor, 
SLOT(update_position()));
-       connect(m_sheet, SIGNAL(transferStarted()), this, 
SLOT(follow_play_head()));
+       connect(m_sheet, SIGNAL(transportStarted()), this, 
SLOT(follow_play_head()));
        connect(m_sheet, SIGNAL(transportPosSet()), this, 
SLOT(follow_play_head()));
        connect(m_sheet, SIGNAL(workingPosChanged()), this, 
SLOT(stop_follow_play_head()));
        

Index: traverso/Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -b -r1.158 -r1.159
--- traverso/Interface.cpp      6 Feb 2009 14:39:22 -0000       1.158
+++ traverso/Interface.cpp      7 Feb 2009 17:41:26 -0000       1.159
@@ -342,7 +342,7 @@
                connect(sheet, SIGNAL(snapChanged()), this, 
SLOT(update_snap_state()));
                connect(sheet, SIGNAL(modeChanged()), this, 
SLOT(update_effects_state()));
                connect(sheet, SIGNAL(tempFollowChanged(bool)), this, 
SLOT(update_temp_follow_state(bool)));
-               connect(sheet, SIGNAL(transferStopped()), this, 
SLOT(update_follow_state()));
+               connect(sheet, SIGNAL(transportStarted()), this, 
SLOT(update_follow_state()));
                update_snap_state();
                update_effects_state();
                m_snapAction->setEnabled(true);

Index: traverso/widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- traverso/widgets/InfoWidgets.cpp    2 Feb 2009 20:27:34 -0000       1.67
+++ traverso/widgets/InfoWidgets.cpp    7 Feb 2009 17:41:26 -0000       1.68
@@ -261,8 +261,8 @@
        
        update_status();
        
-       connect(m_sheet, SIGNAL(transferStopped()), this, 
SLOT(sheet_stopped()));
-       connect(m_sheet, SIGNAL(transferStarted()), this, 
SLOT(sheet_started()));
+       connect(m_sheet, SIGNAL(transportStopped()), this, 
SLOT(sheet_stopped()));
+       connect(m_sheet, SIGNAL(transportStarted()), this, 
SLOT(sheet_started()));
 }
 
 void HDDSpaceInfo::sheet_started()

Index: traverso/widgets/MeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/MeterWidget.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- traverso/widgets/MeterWidget.cpp    15 Feb 2008 23:00:50 -0000      1.4
+++ traverso/widgets/MeterWidget.cpp    7 Feb 2009 17:41:26 -0000       1.5
@@ -167,8 +167,8 @@
                        // FIXME The removed plugin still needs to be 
deleted!!!!!!
                        
Command::process_command(m_sheet->get_plugin_chain()->remove_plugin(m_meter, 
false));
                        timer.stop();
-                       disconnect(m_sheet, SIGNAL(transferStopped()), this, 
SLOT(transport_stopped()));
-                       disconnect(m_sheet, SIGNAL(transferStarted()), this, 
SLOT(transport_started()));
+                       disconnect(m_sheet, SIGNAL(transportStopped()), this, 
SLOT(transport_stopped()));
+                       disconnect(m_sheet, SIGNAL(transportStarted()), this, 
SLOT(transport_started()));
                }
        }
        
@@ -178,8 +178,8 @@
                return;
        }
 
-       connect(m_sheet, SIGNAL(transferStopped()), this, 
SLOT(transport_stopped()));
-       connect(m_sheet, SIGNAL(transferStarted()), this, 
SLOT(transport_started()));
+       connect(m_sheet, SIGNAL(transportStopped()), this, 
SLOT(transport_stopped()));
+       connect(m_sheet, SIGNAL(transportStarted()), this, 
SLOT(transport_started()));
 }
 
 void MeterView::hide_event()