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

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/08/02 22:01:36

Modified files:
        src/core       : AudioClip.cpp FadeCurve.cpp ReadSource.cpp 

Log message:
        fix mem leak in clip edit dialog cancelling, fix crash on quit

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.115&r2=1.116
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/FadeCurve.cpp?cvsroot=traverso&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ReadSource.cpp?cvsroot=traverso&r1=1.45&r2=1.46

Patches:
Index: AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- AudioClip.cpp       18 Jul 2007 20:05:20 -0000      1.115
+++ AudioClip.cpp       2 Aug 2007 22:01:36 -0000       1.116
@@ -148,21 +148,27 @@
        sourceEndFrame = sourceStartFrame + m_length;
        set_track_start_frame( e.attribute( "trackstart", "" ).toUInt());
        
+       emit stateChanged();
+       
        QDomElement fadeInNode = node.firstChildElement("FadeIn");
        if (!fadeInNode.isNull()) {
+               if (!fadeIn) {
                fadeIn = new FadeCurve(this, m_song, "FadeIn");
-               fadeIn->set_state( fadeInNode );
                fadeIn->set_history_stack(get_history_stack());
                private_add_fade(fadeIn);
        }
+               fadeIn->set_state( fadeInNode );
+       }
 
        QDomElement fadeOutNode = node.firstChildElement("FadeOut");
        if (!fadeOutNode.isNull()) {
+               if (!fadeOut) {
                fadeOut = new FadeCurve(this, m_song, "FadeOut");
-               fadeOut->set_state( fadeOutNode );
                fadeOut->set_history_stack(get_history_stack());
                private_add_fade(fadeOut);
        }
+               fadeOut->set_state( fadeOutNode );
+       }
 
        QDomNode pluginChainNode = node.firstChildElement("PluginChain");
        if (!pluginChainNode.isNull()) {

Index: FadeCurve.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/FadeCurve.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- FadeCurve.cpp       30 Jun 2007 16:19:10 -0000      1.23
+++ FadeCurve.cpp       2 Aug 2007 22:01:36 -0000       1.24
@@ -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: FadeCurve.cpp,v 1.23 2007/06/30 16:19:10 n_doebelin Exp $
+$Id: FadeCurve.cpp,v 1.24 2007/08/02 22:01:36 benjie Exp $
 */
  
 #include "FadeCurve.h"
@@ -155,6 +155,8 @@
        
        solve_node_positions(); 
        
+       emit stateChanged();
+       
        return 1;
 }
 

Index: ReadSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ReadSource.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- ReadSource.cpp      26 Jul 2007 00:45:41 -0000      1.45
+++ ReadSource.cpp      2 Aug 2007 22:01:36 -0000       1.46
@@ -117,6 +117,7 @@
        m_error = 0;
        m_clip = 0;
        m_audioReader = 0;
+       m_bufferstatus = 0;
 }
 
 
@@ -131,7 +132,9 @@
                delete m_audioReader;
        }
        
+       if (m_bufferstatus) {
        delete m_bufferstatus;
+       }
 }