traverso-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Traverso-commit] traverso/src commands/AudioClipExternalProcessi...


From: Remon Sijrier
Subject: [Traverso-commit] traverso/src commands/AudioClipExternalProcessi...
Date: Mon, 02 Apr 2007 21:05:43 +0000

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/02 21:05:43

Modified files:
        src/commands   : AudioClipExternalProcessing.cpp Import.cpp 
                         MoveClip.cpp SplitClip.cpp 
        src/core       : AudioClip.cpp Command.cpp Command.h Curve.cpp 
                         FadeCurve.cpp InputEngine.cpp InputEngine.h 
                         Project.cpp Song.cpp 
        src/traverso   : CorrelationMeterWidget.cpp 
                         SpectralMeterWidget.cpp 
        src/traverso/dialogs/project: SongManagerDialog.cpp 
        src/traverso/songcanvas: ClipsViewPort.cpp CurveView.cpp 
                                 FadeView.cpp 

Log message:
        move InputEngine::process_command() to Command::process_command()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/AudioClipExternalProcessing.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Import.cpp?cvsroot=traverso&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.cpp?cvsroot=traverso&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/SplitClip.cpp?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Command.cpp?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Command.h?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Curve.cpp?cvsroot=traverso&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/FadeCurve.cpp?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/InputEngine.cpp?cvsroot=traverso&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/InputEngine.h?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.cpp?cvsroot=traverso&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CorrelationMeterWidget.cpp?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/SpectralMeterWidget.cpp?cvsroot=traverso&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/SongManagerDialog.cpp?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/ClipsViewPort.cpp?cvsroot=traverso&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveView.cpp?cvsroot=traverso&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/FadeView.cpp?cvsroot=traverso&r1=1.11&r2=1.12

Patches:
Index: commands/AudioClipExternalProcessing.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/commands/AudioClipExternalProcessing.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- commands/AudioClipExternalProcessing.cpp    16 Mar 2007 00:10:54 -0000      
1.1
+++ commands/AudioClipExternalProcessing.cpp    2 Apr 2007 21:05:43 -0000       
1.2
@@ -75,10 +75,18 @@
        m_processor->setProcessChannelMode(QProcess::MergedChannels);
        
        ReadSource* rs = 
resources_manager()->get_readsource(m_clip->get_readsource_id());
+/*     if (! rs) {
+               // This should NOT be possible, but just in case....
+               printf("resources manager didn't return a resource for the to 
be processed audioclip (%lld) !!!!\n",
+                               m_clip->get_id());
+               return -1;
+       }*/
+       
        QString name = rs->get_name();
        
        QString infilename = rs->get_filename();
-       QString outfilename = pm().get_project()->get_audiosources_dir() + 
name.remove(".wav").remove(".").append("-").append(command.simplified()).append(".wav");
+       QString outfilename = pm().get_project()->get_audiosources_dir() + 
name.remove(".wav").remove(".")
+                                                       
.append("-").append(command.simplified()).append(".wav");
        
        printf("infilename is %s\n", QS_C(infilename));
        printf("outfilename is %s\n", QS_C(outfilename));
@@ -129,8 +137,8 @@
 int AudioClipExternalProcessing::do_action()
 {
        PENTER;
-       ie().process_command(m_track->remove_clip(m_clip, false));
-       ie().process_command(m_track->add_clip(m_resultingclip, false));
+       Command::process_command(m_track->remove_clip(m_clip, false));
+       Command::process_command(m_track->add_clip(m_resultingclip, false));
        
        return 1;
 }
@@ -138,8 +146,8 @@
 int AudioClipExternalProcessing::undo_action()
 {
        PENTER;
-       ie().process_command(m_track->remove_clip(m_resultingclip, false));
-       ie().process_command(m_track->add_clip(m_clip, false));
+       Command::process_command(m_track->remove_clip(m_resultingclip, false));
+       Command::process_command(m_track->add_clip(m_clip, false));
        return 1;
 }
 

Index: commands/Import.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Import.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- commands/Import.cpp 29 Mar 2007 20:40:53 -0000      1.17
+++ commands/Import.cpp 2 Apr 2007 21:05:43 -0000       1.18
@@ -137,7 +137,7 @@
                create_audioclip();
        }
        
-       ie().process_command(m_track->add_clip(m_clip, false));
+       Command::process_command(m_track->add_clip(m_clip, false));
        
        resources_manager()->undo_remove_clip_from_database(m_clip->get_id());
        
@@ -149,7 +149,7 @@
 {
        PENTER;
                
-       ie().process_command(m_track->remove_clip(m_clip, false));
+       Command::process_command(m_track->remove_clip(m_clip, false));
        
        resources_manager()->remove_clip_from_database(m_clip->get_id());
        

Index: commands/MoveClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- commands/MoveClip.cpp       2 Apr 2007 04:52:49 -0000       1.26
+++ commands/MoveClip.cpp       2 Apr 2007 21:05:43 -0000       1.27
@@ -171,7 +171,7 @@
                connect(d->view->get_clip()->get_track(), 
SIGNAL(audioClipAdded(AudioClip*)),
                        this, SLOT(audioclip_added(AudioClip*)));
        
-               
ie().process_command(d->view->get_clip()->get_track()->add_clip(d->newclip, 
false));
+               
Command::process_command(d->view->get_clip()->get_track()->add_clip(d->newclip, 
false));
                
                return 1;
        }
@@ -217,12 +217,12 @@
        }
 
        if (!m_targetTrack) {
-               ie().process_command(m_originTrack->remove_clip(m_clip, false));
+               Command::process_command(m_originTrack->remove_clip(m_clip, 
false));
                m_targetTrack = (Track*) 0;
        } else {
-               ie().process_command(m_originTrack->remove_clip(m_clip, false));
+               Command::process_command(m_originTrack->remove_clip(m_clip, 
false));
                m_clip->set_track_start_frame(m_originalTrackFirstFrame + 
m_posDiff);
-               ie().process_command(m_targetTrack->add_clip(m_clip, false));
+               Command::process_command(m_targetTrack->add_clip(m_clip, 
false));
        }
        
        if (m_actionType == "copy") {
@@ -244,14 +244,14 @@
 {
        PENTER;
        if (m_targetTrack) {
-               ie().process_command(m_targetTrack->remove_clip(m_clip, false));
+               Command::process_command(m_targetTrack->remove_clip(m_clip, 
false));
        }
        
        if (m_actionType == "copy") {
                
resources_manager()->remove_clip_from_database(m_clip->get_id());
        } else {
                m_clip->set_track_start_frame(m_originalTrackFirstFrame);
-               ie().process_command(m_originTrack->add_clip(m_clip, false));
+               Command::process_command(m_originTrack->add_clip(m_clip, 
false));
        }
 
        if (m_actionType == "anchored_left_edge_move") {
@@ -410,9 +410,9 @@
        Q_UNUSED(autorepeat)
        Track *track = m_clip->get_track();
        
-       ie().process_command(track->remove_clip(m_clip, false));
+       Command::process_command(track->remove_clip(m_clip, false));
        m_clip->set_track_start_frame(m_clip->get_song()->get_last_frame());
-       ie().process_command(track->add_clip(m_clip, false));
+       Command::process_command(track->add_clip(m_clip, false));
 }
 
 

Index: commands/SplitClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/SplitClip.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- commands/SplitClip.cpp      2 Apr 2007 19:23:06 -0000       1.16
+++ commands/SplitClip.cpp      2 Apr 2007 21:05:43 -0000       1.17
@@ -68,10 +68,10 @@
 {
        PENTER;
 
-       ie().process_command(m_track->remove_clip(m_clip, false));
+       Command::process_command(m_track->remove_clip(m_clip, false));
 
-       ie().process_command(m_track->add_clip(leftClip, false));
-       ie().process_command(m_track->add_clip(rightClip, false));
+       Command::process_command(m_track->add_clip(leftClip, false));
+       Command::process_command(m_track->add_clip(rightClip, false));
        
        resources_manager()->undo_remove_clip_from_database(leftClip->get_id());
        
resources_manager()->undo_remove_clip_from_database(rightClip->get_id());
@@ -83,10 +83,10 @@
 {
        PENTER;
 
-       ie().process_command(m_track->remove_clip(leftClip, false));
-       ie().process_command(m_track->remove_clip(rightClip, false));
+       Command::process_command(m_track->remove_clip(leftClip, false));
+       Command::process_command(m_track->remove_clip(rightClip, false));
        
-       ie().process_command(m_track->add_clip(m_clip, false));
+       Command::process_command(m_track->add_clip(m_clip, false));
        
        resources_manager()->remove_clip_from_database(leftClip->get_id());
        resources_manager()->remove_clip_from_database(rightClip->get_id());

Index: core/AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- core/AudioClip.cpp  2 Apr 2007 20:51:11 -0000       1.71
+++ core/AudioClip.cpp  2 Apr 2007 21:05:43 -0000       1.72
@@ -695,7 +695,7 @@
                        emit recordingFinished();
                } else {
                        info().critical(tr("No ReadSource returned from asm 
after recording, removing clip from Track!"));
-                       ie().process_command(m_track->remove_clip(this, false));
+                       Command::process_command(m_track->remove_clip(this, 
false));
                }
        }
 }

Index: core/Command.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Command.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- core/Command.cpp    6 Mar 2007 15:14:16 -0000       1.13
+++ core/Command.cpp    2 Apr 2007 21:05:43 -0000       1.14
@@ -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.13 2007/03/06 15:14:16 r_sijrier Exp $
+$Id: Command.cpp,v 1.14 2007/04/02 21:05:43 r_sijrier Exp $
 */
 
 #include "Command.h"
@@ -259,4 +259,19 @@
        
 }
 
+void Command::process_command(Command * cmd)
+{
+       Q_ASSERT(cmd);
+       
+       if (cmd->prepare_actions()) {
+               cmd->set_valid(true);
+               if (cmd->push_to_history_stack() < 0) {
+                       // QUndoStack calls redo() for us, now it's not
+                       // called, so we do it here!
+                       cmd->redo();
+                       delete cmd;
+               }
+       }
+}
+
 //eof

Index: core/Command.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Command.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- core/Command.h      16 Mar 2007 00:14:43 -0000      1.9
+++ core/Command.h      2 Apr 2007 21:05:43 -0000       1.10
@@ -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.9 2007/03/16 00:14:43 r_sijrier Exp $
+    $Id: Command.h,v 1.10 2007/04/02 21:05:43 r_sijrier Exp $
 */
 
 #ifndef COMMAND_H
@@ -53,6 +53,8 @@
         void set_valid(bool valid);
         int push_to_history_stack();
         
+       static void process_command(Command* cmd);
+        
 
 protected:
         bool           m_isValid;

Index: core/Curve.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Curve.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- core/Curve.cpp      23 Mar 2007 14:36:10 -0000      1.33
+++ core/Curve.cpp      2 Apr 2007 21:05:43 -0000       1.34
@@ -25,7 +25,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: Curve.cpp,v 1.33 2007/03/23 14:36:10 r_sijrier Exp $
+$Id: Curve.cpp,v 1.34 2007/04/02 21:05:43 r_sijrier Exp $
 */
 
 #include "Curve.h"
@@ -123,7 +123,7 @@
                double when = whenValueList.at(0).toDouble();
                double value = whenValueList.at(1).toDouble();
                CurveNode* node = new CurveNode(this, when, value); 
-               ie().process_command( add_node(node, false) );
+               Command::process_command( add_node(node, false) );
        }
        
        return 1;
@@ -511,7 +511,7 @@
  * @param historable Should the returned Command object be placed on the
                history stack?
  * @return A Command object, if the call was generated from the InputEngine,
-       it can be leaved alone, if it was a direct call, use 
ie().process_command()
+       it can be leaved alone, if it was a direct call, use 
Command::process_command()
        to do the actuall work!!
  */
 Command* Curve::add_node(CurveNode* node, bool historable)
@@ -540,7 +540,7 @@
  * @param historable Should the returned Command object be placed on the
                history stack?
  * @return A Command object, if the call was generated from the InputEngine,
-       it can be leaved alone, if it was a direct call, use 
ie().process_command()
+       it can be leaved alone, if it was a direct call, use 
Command::process_command()
        to do the actuall work!!
  */
 Command* Curve::remove_node(CurveNode* node, bool historable)

Index: core/FadeCurve.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/FadeCurve.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- core/FadeCurve.cpp  27 Feb 2007 19:46:54 -0000      1.15
+++ core/FadeCurve.cpp  2 Apr 2007 21:05:43 -0000       1.16
@@ -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.15 2007/02/27 19:46:54 r_sijrier Exp $
+$Id: FadeCurve.cpp,v 1.16 2007/04/02 21:05:43 r_sijrier Exp $
 */
  
 #include "FadeCurve.h"
@@ -26,7 +26,7 @@
 #include <cmath>
 #include "Song.h"
 #include "AudioClip.h"
-#include "InputEngine.h"
+#include "Command.h"
 
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
@@ -81,7 +81,7 @@
                QPointF p = get_curve_point(f);
                
                CurveNode* node = new CurveNode(this, p.x(), p.y());
-               ie().process_command( add_node(node, false) );
+               Command::process_command( add_node(node, false) );
                
 //             printf("adding node with x=%f, y=%f\n", p.x(), p.y());
                

Index: core/InputEngine.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/InputEngine.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- core/InputEngine.cpp        29 Mar 2007 21:09:42 -0000      1.40
+++ core/InputEngine.cpp        2 Apr 2007 21:05:43 -0000       1.41
@@ -455,21 +455,6 @@
        return 1;
 }
 
-void InputEngine::process_command(Command* cmd )
-{
-       Q_ASSERT(cmd);
-       
-       if (cmd->prepare_actions()) {
-               cmd->set_valid(true);
-               if (cmd->push_to_history_stack() < 0) {
-                       // QUndoStack calls redo() for us, now it's not
-                       // called, so we do it here!
-                       cmd->redo();
-                       delete cmd;
-               }
-       }
-}
-
 void InputEngine::jog()
 {
        PENTER3;

Index: core/InputEngine.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/InputEngine.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- core/InputEngine.h  29 Mar 2007 18:58:45 -0000      1.16
+++ core/InputEngine.h  2 Apr 2007 21:05:43 -0000       1.17
@@ -131,7 +131,6 @@
         void catch_mousebutton_release( QMouseEvent * e );
         void catch_mousebutton_doubleclick( QMouseEvent * e );
         void catch_scroll(QWheelEvent * e );
-        void process_command(Command* cmd);
 
         int collected_number();
 

Index: core/Project.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- core/Project.cpp    29 Mar 2007 20:41:05 -0000      1.22
+++ core/Project.cpp    2 Apr 2007 21:05:43 -0000       1.23
@@ -174,7 +174,7 @@
        while(!songNode.isNull())
        {
                Song* song = new Song(this, songNode);
-               ie().process_command(add_song(song, false));
+               Command::process_command(add_song(song, false));
                songNode = songNode.nextSibling();
        }
 

Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- core/Song.cpp       2 Apr 2007 20:52:36 -0000       1.70
+++ core/Song.cpp       2 Apr 2007 21:05:43 -0000       1.71
@@ -572,7 +572,7 @@
                        }
                        group->setText(tr("Recording to %n Clip(s)", "", 
clipcount));
                        
-                       ie().process_command(group);
+                       Command::process_command(group);
                }
                
                transport = true;

Index: traverso/CorrelationMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CorrelationMeterWidget.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- traverso/CorrelationMeterWidget.cpp 5 Mar 2007 20:51:23 -0000       1.18
+++ traverso/CorrelationMeterWidget.cpp 2 Apr 2007 21:05:43 -0000       1.19
@@ -245,7 +245,7 @@
 
        if (m_song) {
                if (m_meter) {
-                       
ie().process_command(m_song->get_plugin_chain()->remove_plugin(m_meter, false));
+                       
Command::process_command(m_song->get_plugin_chain()->remove_plugin(m_meter, 
false));
                        timer.stop();
                }
        }
@@ -271,7 +271,7 @@
        
        m_meter = new CorrelationMeter();
        m_meter->init();
-       ie().process_command( chain->add_plugin(m_meter, false) );
+       Command::process_command( chain->add_plugin(m_meter, false) );
        timer.start(40);
 }
 
@@ -279,7 +279,7 @@
 {
        if (m_song) {
                if (m_meter) {
-                       
ie().process_command(m_song->get_plugin_chain()->remove_plugin(m_meter, false));
+                       
Command::process_command(m_song->get_plugin_chain()->remove_plugin(m_meter, 
false));
                        timer.stop();
                }
        }

Index: traverso/SpectralMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/SpectralMeterWidget.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- traverso/SpectralMeterWidget.cpp    16 Mar 2007 00:10:26 -0000      1.35
+++ traverso/SpectralMeterWidget.cpp    2 Apr 2007 21:05:43 -0000       1.36
@@ -332,7 +332,7 @@
        
        if (m_song) {
                if (m_meter) {
-                       
ie().process_command(m_song->get_plugin_chain()->remove_plugin(m_meter, false));
+                       
Command::process_command(m_song->get_plugin_chain()->remove_plugin(m_meter, 
false));
                        timer.stop();
                }
        }
@@ -361,7 +361,7 @@
        
        m_meter = new SpectralMeter();
        m_meter->init();
-       ie().process_command( chain->add_plugin(m_meter, false) );
+       Command::process_command( chain->add_plugin(m_meter, false) );
 
        timer.start(UPDATE_INTERVAL);
 }
@@ -371,7 +371,7 @@
 {
        if (m_song) {
                if (m_meter) {
-                       
ie().process_command(m_song->get_plugin_chain()->remove_plugin(m_meter, false));
+                       
Command::process_command(m_song->get_plugin_chain()->remove_plugin(m_meter, 
false));
                        timer.stop();
                }
        }

Index: traverso/dialogs/project/SongManagerDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/project/SongManagerDialog.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- traverso/dialogs/project/SongManagerDialog.cpp      21 Mar 2007 19:17:16 
-0000      1.9
+++ traverso/dialogs/project/SongManagerDialog.cpp      2 Apr 2007 21:05:43 
-0000       1.10
@@ -164,7 +164,7 @@
        qint64 id = item->data(0, Qt::UserRole).toLongLong();
        
        // Hmmm, to which history stack should this one be pushed ???? :-(
-       ie().process_command(m_project->remove_song(m_project->get_song(id)));
+       
Command::process_command(m_project->remove_song(m_project->get_song(id)));
 }
 
 void SongManagerDialog::on_createSongButton_clicked( )
@@ -179,7 +179,7 @@
        song->set_title(newSongNameLineEdit->text());
        song->set_artists(artistsLineEdit->text());
        
-       ie().process_command(m_project->add_song(song));
+       Command::process_command(m_project->add_song(song));
 }
 
 

Index: traverso/songcanvas/ClipsViewPort.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/ClipsViewPort.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- traverso/songcanvas/ClipsViewPort.cpp       22 Mar 2007 20:47:24 -0000      
1.11
+++ traverso/songcanvas/ClipsViewPort.cpp       2 Apr 2007 21:05:43 -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: ClipsViewPort.cpp,v 1.11 2007/03/22 20:47:24 r_sijrier Exp $
+$Id: ClipsViewPort.cpp,v 1.12 2007/04/02 21:05:43 r_sijrier Exp $
 */
 
 #include "ClipsViewPort.h"
@@ -121,7 +121,7 @@
                group->add_command(import);
        }
 
-       ie().process_command(group);
+       Command::process_command(group);
 }
 
 void ClipsViewPort::dragMoveEvent( QDragMoveEvent * event )

Index: traverso/songcanvas/CurveView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveView.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- traverso/songcanvas/CurveView.cpp   23 Mar 2007 14:36:27 -0000      1.23
+++ traverso/songcanvas/CurveView.cpp   2 Apr 2007 21:05:43 -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: CurveView.cpp,v 1.23 2007/03/23 14:36:27 r_sijrier Exp $
+$Id: CurveView.cpp,v 1.24 2007/04/02 21:05:43 r_sijrier Exp $
 */
 
 #include "CurveView.h"
@@ -291,7 +291,7 @@
        
        AddRemove* cmd = (AddRemove*) m_guicurve->add_node(nodeview, false);
        cmd->set_instantanious(true);
-       ie().process_command(cmd);
+       Command::process_command(cmd);
        
        qSort(m_nodeViews.begin(), m_nodeViews.end(), Curve::smallerNode);
        
@@ -309,7 +309,7 @@
                        }
                        AddRemove* cmd = (AddRemove*) 
m_guicurve->remove_node(nodeview, false);
                        cmd->set_instantanious(true);
-                       ie().process_command(cmd);
+                       Command::process_command(cmd);
                        
                        delete nodeview;
                        update();

Index: traverso/songcanvas/FadeView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/FadeView.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- traverso/songcanvas/FadeView.cpp    6 Mar 2007 15:28:12 -0000       1.11
+++ traverso/songcanvas/FadeView.cpp    2 Apr 2007 21:05:43 -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: FadeView.cpp,v 1.11 2007/03/06 15:28:12 r_sijrier Exp $
+$Id: FadeView.cpp,v 1.12 2007/04/02 21:05:43 r_sijrier Exp $
 */
 
 #include "FadeView.h"
@@ -56,7 +56,7 @@
                                node->get_value());
                AddRemove* cmd = (AddRemove*) m_guicurve->add_node(guinode, 
false);
                cmd->set_instantanious(true);
-               ie().process_command(cmd);
+               Command::process_command(cmd);
        }
        
        load_theme_data();




reply via email to

[Prev in Thread] Current Thread [Next in Thread]