[Lmuse-cvs-traffic] muse/muse midievent.cpp,1.14,1.15 route.cpp,1.30,1.31 synth.cpp,1.75,1.76

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

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

Modified Files:
	midievent.cpp route.cpp synth.cpp 
Log Message:
more midi routing fixes


Index: midievent.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midievent.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** midievent.cpp	14 Jul 2005 10:25:45 -0000	1.14
--- midievent.cpp	17 Jul 2005 18:57:33 -0000	1.15
***************
*** 91,97 ****
              xml.tag(s);
              QString data;
!             for (int i = 0; i < edata.dataLen; ++i)
!                   data += QString(" 0x%1").arg(edata.data[i] & 0xff, 0, 16);
!             xml.tdata(data);
              xml.etag("event");
              }
--- 91,107 ----
              xml.tag(s);
              QString data;
! 
!             int col = 0;
!             xml.putLevel();
!             for (int i = 0; i < edata.dataLen; ++i, ++col) {
!                   if (col >= 16) {
!                         xml.put("");
!                         col = 0;
!                         xml.putLevel();
!                         }
!                   xml.nput("%02x ", edata.data[i] & 0xff);
!                   }
!             if (col)
!                   xml.put("");
              xml.etag("event");
              }

Index: synth.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/synth.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** synth.cpp	16 May 2005 18:15:59 -0000	1.75
--- synth.cpp	17 Jul 2005 18:57:33 -0000	1.76
***************
*** 387,393 ****
              xml.tag("midistate");
              xml.tag("event type=\"%d\" datalen=\"%d\"", Sysex, len);
!             for (int i = 0; i < len; ++i) {
!                   xml.put("%02x ", p[i] & 0xff);
                    }
              xml.etag("event");
              xml.etag("midistate");
--- 387,402 ----
              xml.tag("midistate");
              xml.tag("event type=\"%d\" datalen=\"%d\"", Sysex, len);
!             int col = 0;
!             xml.putLevel();
!             for (int i = 0; i < len; ++i, ++col) {
!                   if (col >= 16) {
!                         xml.put("");
!                         col = 0;
!                         xml.putLevel();
!                         }
!                   xml.nput("%02x ", p[i] & 0xff);
                    }
+             if (col)
+                   xml.put("");
              xml.etag("event");
              xml.etag("midistate");

Index: route.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/route.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** route.cpp	17 Jul 2005 12:59:06 -0000	1.30
--- route.cpp	17 Jul 2005 18:57:33 -0000	1.31
***************
*** 220,231 ****
  //         dst.tname(), dst.channel, dst.name().latin1());
        if (src.type == Route::AUDIOPORT || src.type == Route::MIDIPORT) {
!             if (dst.type != Route::TRACK) {
                    fprintf(stderr, "removeRoute: bad route 1\n");
!                   // exit(-1);
!                   return;
                    }
!             if (dst.track->type() != Track::AUDIO_INPUT && dst.track->type() != Track::MIDI_IN) {
                    fprintf(stderr, "removeRoute: bad route 2\n");
!                   exit(-1);
                    }
              RouteList* inRoutes = dst.track->inRoutes();
--- 220,232 ----
  //         dst.tname(), dst.channel, dst.name().latin1());
        if (src.type == Route::AUDIOPORT || src.type == Route::MIDIPORT) {
!             if (dst.type != Route::TRACK && dst.type != Route::SYNTIPORT) {
                    fprintf(stderr, "removeRoute: bad route 1\n");
!                   goto error;
                    }
!             if (dst.track->type() != Track::AUDIO_INPUT
!                && dst.track->type() != Track::AUDIO_SOFTSYNTH
!                && dst.track->type() != Track::MIDI_IN) {
                    fprintf(stderr, "removeRoute: bad route 2\n");
!                   goto error;
                    }
              RouteList* inRoutes = dst.track->inRoutes();
***************
*** 242,252 ****
              if (src.type != Route::TRACK) {
                    fprintf(stderr, "removeRoute: bad route 3\n");
!                   // exit(-1);
!                   return;
                    }
              if (src.track->type() != Track::AUDIO_OUTPUT && src.track->type() != Track::MIDI_OUT) {
                    fprintf(stderr, "removeRoute: bad route 4\n");
!                   // exit(-1);
!                   return;
                    }
              RouteList* outRoutes = src.track->outRoutes();
--- 243,251 ----
              if (src.type != Route::TRACK) {
                    fprintf(stderr, "removeRoute: bad route 3\n");
!                   goto error;
                    }
              if (src.track->type() != Track::AUDIO_OUTPUT && src.track->type() != Track::MIDI_OUT) {
                    fprintf(stderr, "removeRoute: bad route 4\n");
!                   goto error;
                    }
              RouteList* outRoutes = src.track->outRoutes();
***************
*** 275,278 ****
--- 274,283 ----
                    }
              }
+       return;
+ error:
+       printf("removeRoute %s.%d:<%s> %s.%d:<%s>\n",
+          src.tname(), src.channel, src.name().latin1(),
+          dst.tname(), dst.channel, dst.name().latin1());
+       abort();
        }