[Traverso-commit] traverso/src core/Song.cpp engine/AudioBus.cpp

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/05/07 21:29:20

Modified files:
        src/core       : Song.cpp 
        src/engine     : AudioBus.cpp 

Log message:
        * restore peak monitor state after audiodevice restart

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/AudioBus.cpp?cvsroot=traverso&r1=1.8&r2=1.9

Patches:
Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- core/Song.cpp       6 May 2007 00:02:38 -0000       1.85
+++ core/Song.cpp       7 May 2007 21:29:20 -0000       1.86
@@ -948,6 +948,12 @@
        delete [] gainbuffer;
        mixdown = new audio_sample_t[audiodevice().get_buffer_size()];
        gainbuffer = new audio_sample_t[audiodevice().get_buffer_size()];
+       foreach(Track* track, m_tracks) {
+               AudioBus* bus = 
audiodevice().get_capture_bus(track->get_bus_in().toAscii());
+               if (bus && track->armed()) {
+                       bus->set_monitor_peaks(true);
+               }
+       }
 }
 
 int Song::get_bitdepth( )

Index: engine/AudioBus.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/engine/AudioBus.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- engine/AudioBus.cpp 7 May 2007 20:48:01 -0000       1.8
+++ engine/AudioBus.cpp 7 May 2007 21:29:20 -0000       1.9
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: AudioBus.cpp,v 1.8 2007/05/07 20:48:01 r_sijrier Exp $
+$Id: AudioBus.cpp,v 1.9 2007/05/07 21:29:20 r_sijrier Exp $
 */
 
 #include "AudioBus.h"
@@ -149,9 +149,10 @@
                channels.at(i)->set_monitor_peaks(m_monitors);
        }
        
-       if (m_monitors) {
+       if (m_monitors > 0) {
                emit monitoringPeaksStarted();
-       } else {
+       }
+       if (m_monitors == 0) {
                emit monitoringPeaksStopped();
        }
 }