[Traverso-commit] traverso/src/core Song.cpp Song.h Track.cpp Tra...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/03 14:18:54

Modified files:
        src/core       : Song.cpp Song.h Track.cpp Track.h 

Log message:
        added boolean flag to get_state() function to only extract the 
'template' part.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.h?cvsroot=traverso&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Track.cpp?cvsroot=traverso&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Track.h?cvsroot=traverso&r1=1.25&r2=1.26

Patches:
Index: Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- Song.cpp    2 Apr 2007 21:05:43 -0000       1.71
+++ Song.cpp    3 Apr 2007 14:18:54 -0000       1.72
@@ -55,6 +55,20 @@
 #include "Debugger.h"
 
 
+Song::Song(Project* project)
+       : ContextItem()
+               , m_project(project)
+{
+       PENTERCONS;
+       title = tr("Untitled");
+       m_id = create_id();
+       m_gain = 1.0f;
+       artists = tr("No artists name set");
+       m_hzoom = config().get_property("Song", "hzoomLevel", 14).toInt();
+
+       init();
+}
+
 Song::Song(Project* project, int numtracks)
        : ContextItem()
        , m_project(project)
@@ -94,6 +108,7 @@
        delete m_hs;
        delete m_audiodeviceClient;
        delete snaplist;
+       delete workSnap;
 }
 
 void Song::init()
@@ -179,10 +194,14 @@
        return 1;
 }
 
-QDomNode Song::get_state(QDomDocument doc)
+QDomNode Song::get_state(QDomDocument doc, bool istemplate)
 {
        QDomElement songNode = doc.createElement("Song");
+       
+       if (! istemplate) {
        songNode.setAttribute("id", m_id);
+       }
+       
        QDomElement properties = doc.createElement("Properties");
        properties.setAttribute("title", title);
        properties.setAttribute("artists", artists);
@@ -449,7 +468,7 @@
 void Song::set_title(const QString& sTitle)
 {
        title=sTitle;
-       emit propertieChanged();
+       emit propertyChanged();
 }
 
 void Song::set_first_visible_frame(nframes_t pos)

Index: Song.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- Song.h      2 Apr 2007 19:23:06 -0000       1.38
+++ Song.h      3 Apr 2007 14:18:54 -0000       1.39
@@ -60,6 +60,7 @@
 
 public:
 
+       Song(Project* project);
        Song(Project* project, int numtracks);
        Song(Project* project, const QDomNode node);
        ~Song();
@@ -78,7 +79,7 @@
        
        QString get_title() const {return title;}
        QString get_artists() const {return artists;}
-       QDomNode get_state(QDomDocument doc);
+       QDomNode get_state(QDomDocument doc, bool istemplate=false);
        QList<Track* > get_tracks() const;
        
        DiskIO* get_diskio() const;
@@ -98,6 +99,7 @@
        void set_transport_pos(nframes_t pos);
        void set_hzoom(int hzoom);
        void set_snapping(bool snap);
+       int set_state( const QDomNode & node );
 
        int process(nframes_t nframes);
        int process_export(nframes_t nframes);
@@ -164,7 +166,6 @@
        Snappable*              workSnap;
 
        void init();
-       int set_state( const QDomNode & node );
 
        int finish_audio_export();
        void start_seek();
@@ -204,7 +205,7 @@
        void lastFramePositionChanged();
        void seekStart(uint position);
        void snapChanged();
-       void propertieChanged();
+       void propertyChanged();
        void setCursorAtEdge();
        void masterGainChanged();
 

Index: Track.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Track.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- Track.cpp   2 Apr 2007 20:52:36 -0000       1.44
+++ Track.cpp   3 Apr 2007 14:18:54 -0000       1.45
@@ -81,10 +81,12 @@
        m_captureRightChannel = m_captureLeftChannel = true;
 }
 
-QDomNode Track::get_state( QDomDocument doc )
+QDomNode Track::get_state( QDomDocument doc, bool istemplate)
 {
        QDomElement node = doc.createElement("Track");
+       if (! istemplate ) {
        node.setAttribute("id", m_id);
+       }
        node.setAttribute("name", m_name);
        node.setAttribute("gain", m_gain);
        node.setAttribute("pan", m_pan);
@@ -99,6 +101,7 @@
        node.setAttribute("CaptureLeftChannel", m_captureLeftChannel);
        node.setAttribute("CaptureRightChannel", m_captureRightChannel);
 
+       if (! istemplate ) {
        QDomNode clips = doc.createElement("Clips");
        
        foreach(AudioClip* clip, audioClipList) {
@@ -113,6 +116,7 @@
        }
        
        node.appendChild(clips);
+       }
        
        QDomNode pluginChainNode = doc.createElement("PluginChain");
        pluginChainNode.appendChild(pluginChain->get_state(doc));

Index: Track.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Track.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- Track.h     29 Mar 2007 11:09:38 -0000      1.25
+++ Track.h     3 Apr 2007 14:18:54 -0000       1.26
@@ -76,7 +76,7 @@
        Song* get_song() const {return m_song;}
        QString get_name() const {return m_name;}
        int get_total_clips();
-       QDomNode get_state(QDomDocument doc);
+       QDomNode get_state(QDomDocument doc, bool istemplate=false);
        AudioClipList get_cliplist() const {return audioClipList;}
        PluginChain* get_plugin_chain() const {return pluginChain;}
        int get_sort_index() const;