[Traverso-commit] traverso/src commands/commands.pro commands/plu...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/05/30 13:57:37

Modified files:
        src/commands   : commands.pro 
        src/commands/plugins: commandplugin.pri 
        src/core       : AudioClip.cpp AudioClip.h Curve.cpp Curve.h 
                         Song.cpp Song.h Track.cpp Track.h 
        src/plugins/native: GainEnvelope.cpp 
        src/plugins    : Plugin.cpp 

Log message:
        * correctly set history stack for fader curve
        * inline get_gain() functions

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/commands.pro?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/plugins/commandplugin.pri?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.h?cvsroot=traverso&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Curve.cpp?cvsroot=traverso&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Curve.h?cvsroot=traverso&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.h?cvsroot=traverso&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Track.cpp?cvsroot=traverso&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Track.h?cvsroot=traverso&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/traverso/src/plugins/native/GainEnvelope.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/plugins/Plugin.cpp?cvsroot=traverso&r1=1.4&r2=1.5

Patches:
Index: commands/commands.pro
===================================================================
RCS file: /sources/traverso/traverso/src/commands/commands.pro,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- commands/commands.pro       30 Apr 2007 10:09:11 -0000      1.18
+++ commands/commands.pro       30 May 2007 13:57:35 -0000      1.19
@@ -45,6 +45,8 @@
 ../traverso \
 ../traverso/songcanvas \
 ../engine \
+../plugins \
+../plugins/native \
 
 win32{
     INCLUDEPATH += ../../3thparty/include

Index: commands/plugins/commandplugin.pri
===================================================================
RCS file: /sources/traverso/traverso/src/commands/plugins/commandplugin.pri,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- commands/plugins/commandplugin.pri  2 Apr 2007 09:52:31 -0000       1.3
+++ commands/plugins/commandplugin.pri  30 May 2007 13:57:36 -0000      1.4
@@ -9,7 +9,9 @@
                ../../../core \
                ../../../traverso/songcanvas \
                ../../../commands \
-               ../../../engine
+               ../../../engine \
+               ../../../plugins \
+               ../../../plugins/native \
                
 DESTDIR = ../../../../lib/commandplugins
 

Index: core/AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- core/AudioClip.cpp  30 May 2007 13:14:45 -0000      1.102
+++ core/AudioClip.cpp  30 May 2007 13:57:36 -0000      1.103
@@ -775,11 +775,6 @@
        m_name = name;
 }
 
-float AudioClip::get_gain( ) const
-{
-       return m_fader->get_gain();
-}
-
 bool AudioClip::is_selected( ) const
 {
        return isSelected;

Index: core/AudioClip.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- core/AudioClip.h    30 May 2007 13:14:45 -0000      1.52
+++ core/AudioClip.h    30 May 2007 13:57:36 -0000      1.53
@@ -30,6 +30,7 @@
 #include "SnapList.h"
 #include "Snappable.h"
 #include "defines.h"
+#include "GainEnvelope.h"
 
 
 class Song;
@@ -42,7 +43,6 @@
 class FadeCurve;
 class Curve;
 class PluginChain;
-class GainEnvelope;
 struct ExportSpecification;
 
 class AudioClip : public ContextItem, public Snappable
@@ -222,5 +222,10 @@
 
 inline qint64 AudioClip::get_readsource_id( ) const {return m_readSourceId;}
 
+inline float AudioClip::get_gain( ) const
+{
+       return m_fader->get_gain();
+}
+
 
 #endif

Index: core/Curve.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Curve.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- core/Curve.cpp      30 May 2007 13:14:46 -0000      1.40
+++ core/Curve.cpp      30 May 2007 13:57:36 -0000      1.41
@@ -657,5 +657,8 @@
        set_changed();
 }
 
-//eof
-
+void Curve::set_song(Song * song)
+{
+       m_song = song; 
+       set_history_stack(m_song->get_history_stack());
+}

Index: core/Curve.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Curve.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- core/Curve.h        30 May 2007 13:14:46 -0000      1.22
+++ core/Curve.h        30 May 2007 13:57:36 -0000      1.23
@@ -67,7 +67,7 @@
        
        // Set functions
        virtual void set_range(double when);
-       void set_song(Song* song) {m_song = song;}
+       void set_song(Song* song);
        
        static bool smallerNode(const CurveNode* left, const CurveNode* right )
        {

Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- core/Song.cpp       30 May 2007 13:14:46 -0000      1.113
+++ core/Song.cpp       30 May 2007 13:57:36 -0000      1.114
@@ -1052,11 +1052,6 @@
        return firstVisibleFrame;
 }
 
-float Song::get_gain() const
-{
-       return m_fader->get_gain();
-}
-
 QList<Track* > Song::get_tracks( ) const
 {
        return m_tracks;

Index: core/Song.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- core/Song.h 30 May 2007 13:14:46 -0000      1.56
+++ core/Song.h 30 May 2007 13:57:36 -0000      1.57
@@ -25,6 +25,7 @@
 #include "ContextItem.h"
 #include <QDomNode>
 #include "defines.h"
+#include "GainEnvelope.h"
 
 class Project;
 class Track;
@@ -41,7 +42,6 @@
 class Plugin;
 class TimeLine;
 class Snappable;
-class GainEnvelope;
 
 struct ExportSpecification;
 
@@ -248,6 +248,12 @@
        return transportFrame;
 }
 
+inline float Song::get_gain() const
+{
+       return m_fader->get_gain();
+}
+
+
 #endif
 
 

Index: core/Track.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Track.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- core/Track.cpp      30 May 2007 13:14:46 -0000      1.59
+++ core/Track.cpp      30 May 2007 13:57:36 -0000      1.60
@@ -118,9 +118,9 @@
                node.appendChild(clips);
        }
        
-       QDomNode m_pluginChainNode = doc.createElement("PluginChain");
-       m_pluginChainNode.appendChild(m_pluginChain->get_state(doc));
-       node.appendChild(m_pluginChainNode);
+       QDomNode pluginChainNode = doc.createElement("PluginChain");
+       pluginChainNode.appendChild(m_pluginChain->get_state(doc));
+       node.appendChild(pluginChainNode);
        
        return node;
 }
@@ -363,12 +363,6 @@
        return audioClipList.count();
 }
 
-
-float Track::get_gain( ) const
-{
-       return m_fader->get_gain();
-}
-
 void Track::set_muted_by_solo(bool muted)
 {
        PENTER;

Index: core/Track.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Track.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- core/Track.h        30 May 2007 13:14:46 -0000      1.29
+++ core/Track.h        30 May 2007 13:57:36 -0000      1.30
@@ -30,6 +30,7 @@
 
 #include "ContextItem.h"
 #include "AudioClipList.h"
+#include "GainEnvelope.h"
 
 #include "defines.h"
 
@@ -37,8 +38,6 @@
 class Song;
 class PluginChain;
 class Plugin;
-class GainEnvelope;
-
 
 class Track : public ContextItem
 {
@@ -173,5 +172,11 @@
 
 };
 
+
+inline float Track::get_gain( ) const
+{
+       return m_fader->get_gain();
+}
+
 #endif
 

Index: plugins/native/GainEnvelope.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/plugins/native/GainEnvelope.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- plugins/native/GainEnvelope.cpp     30 May 2007 13:14:47 -0000      1.1
+++ plugins/native/GainEnvelope.cpp     30 May 2007 13:57:37 -0000      1.2
@@ -93,6 +93,9 @@
 {
        m_song = song;
        set_history_stack(m_song->get_history_stack());
+       if (get_curve()) {
+               get_curve()->set_song(song);
+       }
 }
 
 void GainEnvelope::process(AudioBus * bus, unsigned long nframes)

Index: plugins/Plugin.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/plugins/Plugin.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- plugins/Plugin.cpp  30 May 2007 13:14:47 -0000      1.4
+++ plugins/Plugin.cpp  30 May 2007 13:57:37 -0000      1.5
@@ -231,8 +231,10 @@
                AddRemove* cmd = (AddRemove*)m_curve->add_node(node, false);
                cmd->set_instantanious(true);
                Command::process_command(cmd);
+               if (m_plugin->get_song()) {
                m_curve->set_song(m_plugin->get_song());
        }
+       }
 }
 
 bool PluginControlPort::use_automation()