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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/05/17 22:50:22

Modified files:
        src/commands   : SplitClip.cpp 
        src/core       : Command.cpp Command.h 

Log message:
        * return value of reset_fadein/out changed, took care of that :)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/SplitClip.cpp?cvsroot=traverso&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Command.cpp?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Command.h?cvsroot=traverso&r1=1.11&r2=1.12

Patches:
Index: commands/SplitClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/SplitClip.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- commands/SplitClip.cpp      17 May 2007 21:38:15 -0000      1.29
+++ commands/SplitClip.cpp      17 May 2007 22:50:22 -0000      1.30
@@ -25,6 +25,7 @@
 #include <SongView.h>
 #include <AudioClipView.h>
 #include <ViewItem.h>
+#include "Fade.h"
 
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
@@ -81,14 +82,18 @@
        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();
+               FadeRange* cmd = (FadeRange*)leftClip->reset_fade_out();
+               cmd->set_historable(false);
+               Command::process_command(cmd);
        }
        
        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();
+               FadeRange* cmd = (FadeRange*)rightClip->reset_fade_in();
+               cmd->set_historable(false);
+               Command::process_command(cmd);
        }
        
        return 1;

Index: core/Command.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Command.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- core/Command.cpp    30 Apr 2007 10:09:11 -0000      1.19
+++ core/Command.cpp    17 May 2007 22:50:22 -0000      1.20
@@ -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: Command.cpp,v 1.19 2007/04/30 10:09:11 r_sijrier Exp $
+$Id: Command.cpp,v 1.20 2007/05/17 22:50:22 r_sijrier Exp $
 */
 
 #include "Command.h"
@@ -285,5 +285,10 @@
        }
 }
 
+void Command::set_historable(bool historible)
+{
+       m_isHistorable = historible;
+}
+
 //eof
 

Index: core/Command.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Command.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- core/Command.h      13 Apr 2007 09:57:35 -0000      1.11
+++ core/Command.h      17 May 2007 22:50:22 -0000      1.12
@@ -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: Command.h,v 1.11 2007/04/13 09:57:35 r_sijrier Exp $
+    $Id: Command.h,v 1.12 2007/05/17 22:50:22 r_sijrier Exp $
 */
 
 #ifndef COMMAND_H
@@ -52,6 +52,7 @@
        void redo() {do_action();}
 
         void set_valid(bool valid);
+       void set_historable(bool historible);
         int push_to_history_stack();
        
        static void process_command(Command* cmd);