[Lmuse-cvs-traffic] muse/muse/mixer astrip.cpp,1.70,1.71

[werner s. <wsc...@us...>]

Update of /cvsroot/lmuse/muse/muse/mixer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16761/muse/mixer

Modified Files:
	astrip.cpp 
Log Message:
routing fixes


Index: astrip.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/mixer/astrip.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** astrip.cpp	15 Nov 2005 21:13:53 -0000	1.70
--- astrip.cpp	18 Nov 2005 16:51:14 -0000	1.71
***************
*** 741,748 ****
  void AudioStrip::iRoutePressed()
        {
!       QMenu* pup = new QMenu(iR);//Q3PopupMenu* pup = new Q3PopupMenu(iR);
!       AudioTrack* t   = (AudioTrack*)track;
!       RouteList* irl  = t->inRoutes();
!       //pup->setCheckable(true);
  
        switch(track->type()) {
--- 741,747 ----
  void AudioStrip::iRoutePressed()
        {
!       QMenu* pup     = new QMenu(iR);
!       AudioTrack* t  = (AudioTrack*)track;
!       RouteList* irl = t->inRoutes();
  
        switch(track->type()) {
***************
*** 754,759 ****
                    int gid = 0;
                    for (int i = 0; i < channel; ++i) {
!                         char buffer[128];
!                         snprintf(buffer, 128, "%s %d", tr("Channel").toLatin1().data(), i+1);
  //TD                        MenuTitleItem* titel = new MenuTitleItem(QString(buffer));
  //                        pup->insertItem(titel);
--- 753,758 ----
                    int gid = 0;
                    for (int i = 0; i < channel; ++i) {
! //                        char buffer[128];
! //                        snprintf(buffer, 128, "%s %d", tr("Channel").toLatin1().data(), i+1);
  //TD                        MenuTitleItem* titel = new MenuTitleItem(QString(buffer));
  //                        pup->insertItem(titel);
***************
*** 763,772 ****
                                QAction* id = pup->addAction(ip->name);
                                id->setData(QVariant(gid * 16 + i));
-                               //int id = pup->insertItem(ip->name, (gid * 16) + i);
                                Route src(ip->name, i, Route::AUDIOPORT);
                                ++gid;
                                for (iRoute ir = irl->begin(); ir != irl->end(); ++ir) {
                                      if (*ir == src) {
!                                           id->setCheckable(true); //pup->setItemChecked(id, true);
                                            id->setChecked(true);
                                            break;
--- 762,770 ----
                                QAction* id = pup->addAction(ip->name);
                                id->setData(QVariant(gid * 16 + i));
                                Route src(ip->name, i, Route::AUDIOPORT);
                                ++gid;
                                for (iRoute ir = irl->begin(); ir != irl->end(); ++ir) {
                                      if (*ir == src) {
!                                           id->setCheckable(true);
                                            id->setChecked(true);
                                            break;
***************
*** 804,813 ****
        if (n != 0) {
              int id = n->data().toInt();
!             QString s(n->text()); //QString s(pup->text(n));
              Route srcRoute, dstRoute;
  
              if (track->type() == Track::AUDIO_INPUT) {
!                   srcRoute = Route(s, id & 0xf, Route::AUDIOPORT);//srcRoute = Route(s, n & 0xf, Route::AUDIOPORT);
!                   dstRoute = Route(t, id & 0xf, Route::TRACK);//dstRoute = Route(t, n & 0xf, Route::TRACK);
                    }
              else if (track->type() == Track::AUDIO_SOFTSYNTH) {
--- 802,811 ----
        if (n != 0) {
              int id = n->data().toInt();
!             QString s(n->text());
              Route srcRoute, dstRoute;
  
              if (track->type() == Track::AUDIO_INPUT) {
!                   srcRoute = Route(s, id & 0xf, Route::AUDIOPORT);
!                   dstRoute = Route(t, id & 0xf, Route::TRACK);
                    }
              else if (track->type() == Track::AUDIO_SOFTSYNTH) {