[Traverso-commit] traverso/src core/Song.cpp traverso/widgets/Inf...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/05/17 19:59:29

Modified files:
        src/core       : Song.cpp 
        src/traverso/widgets: InfoWidgets.cpp 

Log message:
        * init scrollbarvalues to 0
        * song set fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.29&r2=1.30

Patches:
Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- core/Song.cpp       17 May 2007 12:45:19 -0000      1.101
+++ core/Song.cpp       17 May 2007 19:59:29 -0000      1.102
@@ -161,6 +161,7 @@
        // TODO seek to old position on project exit ?
        transportFrame = 0;
        m_mode = EDIT;
+       m_sbx = m_sby = 0;
        
        m_pluginChain = new PluginChain(this, this);
        m_timeline = new TimeLine(this);

Index: traverso/widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- traverso/widgets/InfoWidgets.cpp    17 May 2007 16:35:01 -0000      1.29
+++ traverso/widgets/InfoWidgets.cpp    17 May 2007 19:59:29 -0000      1.30
@@ -603,6 +603,24 @@
        update_follow_state();
 }
 
+void SongInfo::set_project(Project * project)
+{
+       m_project = project;
+       
+       if (!project) {
+               m_songselectbox->clear();
+               set_song(0);
+               return;
+       }
+       
+       connect(m_project, SIGNAL(songAdded(Song*)), this, 
SLOT(song_selector_song_added(Song*)));
+       connect(m_project, SIGNAL(songRemoved(Song*)), this, 
SLOT(song_selector_song_removed(Song*)));
+       connect(m_project, SIGNAL(currentSongChanged(Song*)), this, 
SLOT(song_selector_change_index_to(Song*)));
+       connect(m_project, SIGNAL(currentSongChanged(Song*)), this, 
SLOT(set_song(Song*)));
+       
+       song_selector_update_songs();
+}
+
 void SongInfo::set_song(Song* song)
 {
        m_song = song;
@@ -695,24 +713,6 @@
        return QSize(400, SONG_TOOLBAR_HEIGHT);
 }
 
-
-void SongInfo::set_project(Project * project)
-{
-       if ( ! project) {
-               m_project = project;
-               m_songselectbox->clear();
-               return;
-       }
-       
-       m_project = project;
-       
-       connect(m_project, SIGNAL(songAdded(Song*)), this, 
SLOT(song_selector_song_added(Song*)));
-       connect(m_project, SIGNAL(songRemoved(Song*)), this, 
SLOT(song_selector_song_removed(Song*)));
-       connect(m_project, SIGNAL(currentSongChanged(Song*)), this, 
SLOT(song_selector_change_index_to(Song*)));
-       
-       song_selector_update_songs();
-}
-
 void SongInfo::song_selector_update_songs()
 {
        m_songselectbox->clear();