[Traverso-commit] traverso/src commands/Import.cpp commands/Multi...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       08/01/02 19:24:00

Modified files:
        src/commands   : Import.cpp MultiMove.cpp 
        src/common     : defines.h 
        src/core       : Song.cpp Song.h Track.cpp Track.h 
        src/traverso/dialogs: BusSelectorDialog.cpp 
                              InsertSilenceDialog.cpp 
        src/traverso   : Interface.cpp 
        src/traverso/songcanvas: SongView.cpp TrackView.cpp 
        src/traverso/widgets: InfoWidgets.cpp 

Log message:
        * There can be only one APILinkedList in use for any APILinkedListNode *
        Make the owners of an APILinkedList list the exclusive owners, by not 
returning it in a get_foo() function, but instead return a QList...  (Not yet 
done for Curve's nodes)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Import.cpp?cvsroot=traverso&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MultiMove.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/common/defines.h?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.167&r2=1.168
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.h?cvsroot=traverso&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Track.cpp?cvsroot=traverso&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Track.h?cvsroot=traverso&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/BusSelectorDialog.cpp?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/InsertSilenceDialog.cpp?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.120&r2=1.121
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.cpp?cvsroot=traverso&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackView.cpp?cvsroot=traverso&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.52&r2=1.53

Patches:
Index: commands/Import.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Import.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- commands/Import.cpp 6 Dec 2007 20:41:27 -0000       1.32
+++ commands/Import.cpp 2 Jan 2008 19:23:58 -0000       1.33
@@ -145,7 +145,7 @@
        
        TimeRef startLocation;
        if (!m_hasPosition) {
-               if (AudioClip* lastClip = 
(AudioClip*)m_track->get_cliplist().last()) {
+               if (AudioClip* lastClip = m_track->get_cliplist().last()) {
                        startLocation = lastClip->get_track_end_location();
                }
        } else {

Index: commands/MultiMove.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MultiMove.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- commands/MultiMove.cpp      2 Jan 2008 03:03:38 -0000       1.1
+++ commands/MultiMove.cpp      2 Jan 2008 19:23:58 -0000       1.2
@@ -44,7 +44,7 @@
        if (!allTracks) {
                QList<QObject* >objs = cpointer().get_context_items();
                foreach(QObject* obj, objs) {
-                       Track* t = dynamic_cast<Track*>(obj);
+                       Track* t = qobject_cast<Track*>(obj);
                        if (t) {
                                m_track = t;
                                break;
@@ -111,16 +111,16 @@
                }
        }
        
-       APILinkedList tracks = m_song->get_tracks();
+       QList<Track*> tracks = m_song->get_tracks();
        
        if (m_track) {
                tracks.clear();
                tracks.append(m_track);
        }
        
-       apill_foreach(Track* track, Track, tracks) {
-               APILinkedList clips = track->get_cliplist();
-               apill_foreach(AudioClip* clip, AudioClip, clips) {
+       foreach(Track* track, tracks) {
+               QList<AudioClip*> clips = track->get_cliplist();
+               foreach(AudioClip* clip, clips) {
                        if (clip->get_track_end_location() > m_originalPos) {
                                m_clips.append(clip);
                                

Index: common/defines.h
===================================================================
RCS file: /sources/traverso/traverso/src/common/defines.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- common/defines.h    23 Oct 2007 17:38:29 -0000      1.4
+++ common/defines.h    2 Jan 2008 19:23:59 -0000       1.5
@@ -390,9 +390,14 @@
        extern int libjack_is_present;\
        extern int libjack_symbol_is_present(char *s);
 
-#define RELAYTOOL_WAVPACK \
+// since wavpack is not commonly available yet, we link to it statically for 
now
+// and set it to available!
+/*#define RELAYTOOL_WAVPACK \
        extern int libwavpack_is_present;\
-       extern int libwavpack_symbol_is_present(char *s);
+       extern int libwavpack_symbol_is_present(char *s); */
+#define RELAYTOOL_WAVPACK \
+       static const int libwavpack_is_present=1;\
+       static int __attribute__((unused)) libwavpack_symbol_is_present(char *) 
{ return 1; }
 
 #define RELAYTOOL_FLAC \
        extern int libFLAC_is_present;\
@@ -419,6 +424,9 @@
        extern int libvorbisenc_is_present;\
        extern int libvorbisenc_symbol_is_present(char *s);
 
+#define RELAYTOOL_MP3LAME \
+       extern int libmp3lame_is_present;\
+       extern int libmp3lame_symbol_is_present(char *s);
 
 #else
 

Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -b -r1.167 -r1.168
--- core/Song.cpp       29 Dec 2007 21:40:25 -0000      1.167
+++ core/Song.cpp       2 Jan 2008 19:23:59 -0000       1.168
@@ -1402,3 +1402,13 @@
        }
 }
 
+
+
+QList< Track * > Song::get_tracks() const
+{
+       QList<Track*> list;
+       apill_foreach(Track* track, Track, m_tracks) {
+               list.append(track);
+       }
+       return list;    
+}
\ No newline at end of file

Index: core/Song.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- core/Song.h 29 Dec 2007 03:00:25 -0000      1.78
+++ core/Song.h 2 Jan 2008 19:23:59 -0000       1.79
@@ -96,7 +96,7 @@
        QString get_title() const {return title;}
        QString get_artists() const {return artists;}
        QDomNode get_state(QDomDocument doc, bool istemplate=false);
-       APILinkedList& get_tracks() {return m_tracks;}
+       QList<Track*> get_tracks() const;
        
        DiskIO* get_diskio() const;
        AudioClipManager* get_audioclip_manager() const;

Index: core/Track.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Track.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- core/Track.cpp      26 Nov 2007 16:02:13 -0000      1.75
+++ core/Track.cpp      2 Jan 2008 19:23:59 -0000       1.76
@@ -556,3 +556,13 @@
 {
        m_clips.sort(clip);
 }
+
+
+QList< AudioClip * > Track::get_cliplist() const
+{
+       QList<AudioClip*> list;
+       apill_foreach(AudioClip* clip, AudioClip, m_clips) {
+               list.append(clip);
+       }
+       return list;
+}

Index: core/Track.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Track.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- core/Track.h        26 Nov 2007 16:02:13 -0000      1.36
+++ core/Track.h        2 Jan 2008 19:23:59 -0000       1.37
@@ -79,7 +79,7 @@
        int get_total_clips();
        QDomNode get_state(QDomDocument doc, bool istemplate=false);
        PluginChain* get_plugin_chain() const {return m_pluginChain;}
-       APILinkedList& get_cliplist() {return m_clips;}
+       QList<AudioClip*> get_cliplist() const;
        int get_sort_index() const;
        bool is_smaller_then(APILinkedListNode* node) {return 
((Track*)node)->get_sort_index() > get_sort_index();}
 

Index: traverso/dialogs/BusSelectorDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/BusSelectorDialog.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- traverso/dialogs/BusSelectorDialog.cpp      29 Nov 2007 12:02:45 -0000      
1.8
+++ traverso/dialogs/BusSelectorDialog.cpp      2 Jan 2008 19:23:59 -0000       
1.9
@@ -176,7 +176,7 @@
        
        Song* song = pm().get_project()->get_current_song();
        
-       apill_foreach(Track* track, Track, song->get_tracks()) {
+       foreach(Track* track, song->get_tracks()) {
                QString fulltitle = QString::number(track->get_sort_index() + 
1) + " " + track->get_name();
                trackComboBox->addItem(fulltitle, track->get_id());
        }

Index: traverso/dialogs/InsertSilenceDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/InsertSilenceDialog.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- traverso/dialogs/InsertSilenceDialog.cpp    19 Nov 2007 11:18:54 -0000      
1.8
+++ traverso/dialogs/InsertSilenceDialog.cpp    2 Jan 2008 19:23:59 -0000       
1.9
@@ -53,13 +53,13 @@
 void InsertSilenceDialog::accept()
 {
        Song* song = pm().get_project()->get_current_song();
-       APILinkedList tracks = song->get_tracks();
+       QList<Track*> tracks = song->get_tracks();
 
        // Make sure track is still in the song
        if (m_track){
                Track*  foundTrack = 0;
 
-               apill_foreach(Track* track, Track, tracks) {
+               foreach(Track* track, tracks) {
                        if (track == m_track) {
                                foundTrack = track;
                        }
@@ -71,8 +71,8 @@
                if (!m_track){
                        Track*  shortestTrack = (Track*)tracks.first();
        
-                       apill_foreach(Track* track, Track, tracks) {
-                               if (track->get_cliplist().last() && 
((AudioClip*)track->get_cliplist().last())->get_track_end_location() > 
((AudioClip*)shortestTrack->get_cliplist().last())->get_track_end_location()) {
+                       foreach(Track* track, tracks) {
+                               if (track->get_cliplist().last() && 
(track->get_cliplist().last())->get_track_end_location() > 
(shortestTrack->get_cliplist().last())->get_track_end_location()) {
                                        shortestTrack = track;
                                }
                        }

Index: traverso/Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- traverso/Interface.cpp      18 Dec 2007 18:08:59 -0000      1.120
+++ traverso/Interface.cpp      2 Jan 2008 19:23:59 -0000       1.121
@@ -1046,11 +1046,11 @@
 void Interface::import_audio()
 {
        if (currentSongWidget->get_song()->get_numtracks() > 0) {
-               APILinkedList tracks = 
currentSongWidget->get_song()->get_tracks();
-               Track*  shortestTrack = (Track*)tracks.first();
+               QList<Track*> tracks = 
currentSongWidget->get_song()->get_tracks();
+               Track*  shortestTrack = tracks.first();
 
-               apill_foreach(Track* track, Track, tracks) {
-                       if (track->get_cliplist().last() && 
((AudioClip*)track->get_cliplist().last())->get_track_end_location() > 
((AudioClip*)shortestTrack->get_cliplist().last())->get_track_end_location()) {
+               foreach(Track* track, tracks) {
+                       if (track->get_cliplist().last() && 
(track->get_cliplist().last())->get_track_end_location() > 
(shortestTrack->get_cliplist().last())->get_track_end_location()) {
                                shortestTrack = track;
                        }
                }

Index: traverso/songcanvas/SongView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- traverso/songcanvas/SongView.cpp    27 Dec 2007 22:27:23 -0000      1.95
+++ traverso/songcanvas/SongView.cpp    2 Jan 2008 19:23:59 -0000       1.96
@@ -113,7 +113,7 @@
        
        song_mode_changed();
        
-       apill_foreach(Track* track, Track, m_song->get_tracks()) {
+       foreach(Track* track, m_song->get_tracks()) {
                add_new_trackview(track);
        }
        

Index: traverso/songcanvas/TrackView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TrackView.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- traverso/songcanvas/TrackView.cpp   19 Nov 2007 11:18:54 -0000      1.37
+++ traverso/songcanvas/TrackView.cpp   2 Jan 2008 19:23:59 -0000       1.38
@@ -66,7 +66,7 @@
        connect(m_track, SIGNAL(audioClipRemoved(AudioClip*)), this, 
SLOT(remove_audioclipview(AudioClip*)));
        
        
-       apill_foreach(AudioClip* clip, AudioClip, m_track->get_cliplist()) {
+       foreach(AudioClip* clip, m_track->get_cliplist()) {
                add_new_audioclipview(clip);
        }
 }

Index: traverso/widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- traverso/widgets/InfoWidgets.cpp    3 Dec 2007 16:24:20 -0000       1.52
+++ traverso/widgets/InfoWidgets.cpp    2 Jan 2008 19:23:59 -0000       1.53
@@ -330,7 +330,7 @@
        if (recordingSongs.size()) {
                int recChannelCount = 0;
                foreach(Song* song, recordingSongs) {
-                       apill_foreach(Track* track, Track, song->get_tracks()) {
+                       foreach(Track* track, song->get_tracks()) {
                                if (track->armed()) {
                                        recChannelCount += 
track->capture_left_channel() ? 1 : 0;
                                        recChannelCount += 
track->capture_right_channel() ? 1 : 0;
@@ -748,7 +748,7 @@
                m_recAction->setIcon(find_pixmap(":/redled-16"));
                QString recordFormat = config().get_property("Recording", 
"FileFormat", "wav").toString();
                int count = 0;
-               apill_foreach(Track* track, Track, m_song->get_tracks()) {
+               foreach(Track* track, m_song->get_tracks()) {
                        if (track->armed()) {
                                count++;
                        }