[Traverso-commit] traverso/src commands/SplitClip.cpp core/AudioC...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/27 04:38:15

Modified files:
        src/commands   : SplitClip.cpp 
        src/core       : AudioClip.cpp FadeCurve.cpp 

Log message:
        * SplitClip: Reset fade out of left clip, fade in of right clip
        * FadeCurve: force nodes to be added directly in the set_state() 
function!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/SplitClip.cpp?cvsroot=traverso&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/FadeCurve.cpp?cvsroot=traverso&r1=1.17&r2=1.18

Patches:
Index: commands/SplitClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/SplitClip.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- commands/SplitClip.cpp      26 Apr 2007 11:30:40 -0000      1.25
+++ commands/SplitClip.cpp      27 Apr 2007 04:38:15 -0000      1.26
@@ -80,10 +80,16 @@
        leftClip->set_song(m_clip->get_song());
        leftClip->set_track_start_frame( m_clip->get_track_start_frame() );
        leftClip->set_right_edge(m_splitPoint);
+       if (leftClip->get_fade_out()) {
+               leftClip->reset_fade_out();
+       }
        
        rightClip->set_song(m_clip->get_song());
        rightClip->set_left_edge(m_splitPoint);
        rightClip->set_track_start_frame(m_splitPoint);
+       if (rightClip->get_fade_in()) {
+               rightClip->reset_fade_in();
+       }
 
        return 1;
 }

Index: core/AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- core/AudioClip.cpp  26 Apr 2007 18:57:57 -0000      1.82
+++ core/AudioClip.cpp  27 Apr 2007 04:38:15 -0000      1.83
@@ -955,7 +955,7 @@
 
 void AudioClip::private_remove_fade( FadeCurve * fade )
 {
-       m_fades.append(fade);
+       m_fades.removeAll(fade);
 }
 
 int AudioClip::get_ref_count( ) const

Index: core/FadeCurve.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/FadeCurve.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- core/FadeCurve.cpp  16 Apr 2007 09:08:31 -0000      1.17
+++ core/FadeCurve.cpp  27 Apr 2007 04:38:15 -0000      1.18
@@ -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.17 2007/04/16 09:08:31 r_sijrier Exp $
+$Id: FadeCurve.cpp,v 1.18 2007/04/27 04:38:15 r_sijrier Exp $
 */
  
 #include "FadeCurve.h"
@@ -27,6 +27,7 @@
 #include "Song.h"
 #include "AudioClip.h"
 #include "Command.h"
+#include <AddRemove.h>
 
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
@@ -81,7 +82,9 @@
                QPointF p = get_curve_point(f);
                
                CurveNode* node = new CurveNode(this, p.x(), p.y());
-               Command::process_command( add_node(node, false) );
+               AddRemove* cmd = (AddRemove*) add_node(node, false);
+               cmd->set_instantanious(true);
+               Command::process_command(cmd);
                
 //             printf("adding node with x=%f, y=%f\n", p.x(), p.y());