[Traverso-commit] traverso/src plugins/native/GainEnvelope.cpp tr...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/09/26 16:44:14

Modified files:
        src/plugins/native: GainEnvelope.cpp 
        src/traverso/songcanvas: AudioClipView.cpp 

Log message:
        * use correct parameter to apply gain !!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/plugins/native/GainEnvelope.cpp?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.97&r2=1.98

Patches:
Index: plugins/native/GainEnvelope.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/plugins/native/GainEnvelope.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- plugins/native/GainEnvelope.cpp     24 Sep 2007 16:58:38 -0000      1.3
+++ plugins/native/GainEnvelope.cpp     26 Sep 2007 16:44:13 -0000      1.4
@@ -78,7 +78,7 @@
        PluginControlPort* port = m_controlPorts.at(0);
        
        for (int chan=0; chan<channels; ++chan) {
-               Mixer::apply_gain_to_buffer(buffer[chan], nframes, 
port->get_control_value());
+               Mixer::apply_gain_to_buffer(buffer[chan], nframes, m_gain);
                
                if (port->use_automation()) {
                        port->get_curve()->process(buffer[chan], startlocation, 
endlocation, nframes);

Index: traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- traverso/songcanvas/AudioClipView.cpp       26 Sep 2007 16:32:53 -0000      
1.97
+++ traverso/songcanvas/AudioClipView.cpp       26 Sep 2007 16:44:14 -0000      
1.98
@@ -308,17 +308,19 @@
                FadeView* view = m_fadeViews.at(i);
                float fademixdown[pixelcount];
                int fademix = 0;
+               
                if (mixcurvedata) {
                        fademix = view->get_vector(xstart, pixelcount, 
fademixdown);
                } else {
                        fademix = view->get_vector(xstart, pixelcount, 
curvemixdown);
                }
-               printf("fademix is %d\n", fademix);
+               
                if (mixcurvedata && fademix) {
                        for (int j=0; j<pixelcount; ++j) {
                                curvemixdown[j] *= fademixdown[j];
                        }
                }
+               
                mixcurvedata |= fademix;
        }