[Lmuse-cvs-traffic] muse/muse/arranger tlist.cpp, 1.31.2.23, 1.31.2.24

[terminator356 <ter...@us...>]

Update of /cvsroot/lmuse/muse/muse/arranger
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18788/muse/arranger

Modified Files:
      Tag: REL07
	tlist.cpp 
Log Message:
See ChangeLog

Index: tlist.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/Attic/tlist.cpp,v
retrieving revision 1.31.2.23
retrieving revision 1.31.2.24
diff -C2 -d -r1.31.2.23 -r1.31.2.24
*** tlist.cpp	14 Nov 2009 03:37:48 -0000	1.31.2.23
--- tlist.cpp	16 Nov 2009 01:55:55 -0000	1.31.2.24
***************
*** 705,713 ****
                    QPopupMenu* synp = new QPopupMenu(this);
                    synp->clear();
!                   const int synth_base_id = 0x1000;
                    int ii = 0;
                    for(std::vector<Synth*>::iterator i = synthis.begin(); i != synthis.end(); ++i) 
                    {
!                     synp->insertItem(*synthIcon, (*i)->baseName(), synth_base_id + ii, -1);
                      ++ii;
                    }
--- 705,713 ----
                    QPopupMenu* synp = new QPopupMenu(this);
                    synp->clear();
!                   //const int synth_base_id = 0x1000;
                    int ii = 0;
                    for(std::vector<Synth*>::iterator i = synthis.begin(); i != synthis.end(); ++i) 
                    {
!                     synp->insertItem(*synthIcon, QT_TR_NOOP((*i)->baseName()), MENU_ADD_SYNTH_ID_BASE + ii, -1);
                      ++ii;
                    }
***************
*** 719,735 ****
  
                    // Valid click?
!                   if((n != -1) && (n != synp_id)) 
                    {
                      // Synth sub-menu id?
!                     if(n >= synth_base_id)
!                       t = song->createSynthI(synp->text(n));
                      // Normal track.
                      else
                        t = song->addTrack((Track::TrackType)n);
                      
!                     song->deselectTracks();
!                     t->setSelected(true);
!                     emit selectionChanged();
!                     adjustScrollbar();
                    }
                    
--- 719,744 ----
  
                    // Valid click?
!                   if((n >= 0) && (n != synp_id)) 
                    {
                      // Synth sub-menu id?
!                     if(n >= MENU_ADD_SYNTH_ID_BASE)
!                     {
!                       if((n - MENU_ADD_SYNTH_ID_BASE) < (int)synthis.size())
!                         t = song->createSynthI(synp->text(n));
!                       //n -= MENU_ADD_SYNTH_ID_BASE;
!                       //if(n < synthis.size())
!                       //  t = song->createSynthI(synthis[n]->baseName());
!                     }  
                      // Normal track.
                      else
                        t = song->addTrack((Track::TrackType)n);
                      
!                     if(t)
!                     {
!                       song->deselectTracks();
!                       t->setSelected(true);
!                       emit selectionChanged();
!                       adjustScrollbar();
!                     }  
                    }
                    
***************
*** 919,922 ****
--- 928,933 ----
                      else
                      {
+                         if(t->type() != Track::AUDIO_SOFTSYNTH)
+                         {
                            AudioTrack* at = dynamic_cast<AudioTrack*>(t);
                            if (at == 0)
***************
*** 932,935 ****
--- 943,947 ----
                                  song->update(SC_CHANNELS);
                                  }
+                         }         
                      }      
                    }