[Lmuse-cvs-traffic] muse/muse app.cpp,1.110,1.111 conf.cpp,1.32,1.33 route.cpp,1.17,1.18 sig.cpp,1.4,1.5 song.cpp,1.58,1.59 tempo.cpp,1.6,1.7

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

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

Modified Files:
	app.cpp conf.cpp route.cpp sig.cpp song.cpp tempo.cpp 
Log Message:
foobar


Index: route.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/route.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** route.cpp	28 Feb 2004 14:58:21 -0000	1.17
--- route.cpp	14 Jul 2004 18:32:48 -0000	1.18
***************
*** 71,75 ****
              if (dst.type != TRACK_ROUTE) {
                    fprintf(stderr, "addRoute: bad route 1\n");
!                   exit(-1);
                    }
              if (dst.track->type() != Track::AUDIO_INPUT) {
--- 71,76 ----
              if (dst.type != TRACK_ROUTE) {
                    fprintf(stderr, "addRoute: bad route 1\n");
!                   // exit(-1);
!                   return;
                    }
              if (dst.track->type() != Track::AUDIO_INPUT) {
***************
*** 88,96 ****
              if (src.type != TRACK_ROUTE) {
                    fprintf(stderr, "addRoute: bad route 3\n");
!                   exit(-1);
                    }
              if (src.track->type() != Track::AUDIO_OUTPUT) {
                    fprintf(stderr, "addRoute: bad route 4\n");
!                   exit(-1);
                    }
              RouteList* outRoutes = src.track->outRoutes();
--- 89,99 ----
              if (src.type != TRACK_ROUTE) {
                    fprintf(stderr, "addRoute: bad route 3\n");
!                   // exit(-1);
!                   return;
                    }
              if (src.track->type() != Track::AUDIO_OUTPUT) {
                    fprintf(stderr, "addRoute: bad route 4\n");
!                   // exit(-1);
!                   return;
                    }
              RouteList* outRoutes = src.track->outRoutes();
***************
*** 132,140 ****
              if (dst.type != TRACK_ROUTE) {
                    fprintf(stderr, "removeRoute: bad route 1\n");
!                   exit(-1);
                    }
              if (dst.track->type() != Track::AUDIO_INPUT) {
                    fprintf(stderr, "removeRoute: bad route 2\n");
!                   exit(-1);
                    }
              RouteList* inRoutes = dst.track->inRoutes();
--- 135,145 ----
              if (dst.type != TRACK_ROUTE) {
                    fprintf(stderr, "removeRoute: bad route 1\n");
!                   // exit(-1);
!                   return;
                    }
              if (dst.track->type() != Track::AUDIO_INPUT) {
                    fprintf(stderr, "removeRoute: bad route 2\n");
!                   // exit(-1);
!                   return;
                    }
              RouteList* inRoutes = dst.track->inRoutes();
***************
*** 150,158 ****
              if (src.type != TRACK_ROUTE) {
                    fprintf(stderr, "removeRoute: bad route 3\n");
!                   exit(-1);
                    }
              if (src.track->type() != Track::AUDIO_OUTPUT) {
                    fprintf(stderr, "removeRoute: bad route 4\n");
!                   exit(-1);
                    }
              RouteList* outRoutes = src.track->outRoutes();
--- 155,165 ----
              if (src.type != TRACK_ROUTE) {
                    fprintf(stderr, "removeRoute: bad route 3\n");
!                   // exit(-1);
!                   return;
                    }
              if (src.track->type() != Track::AUDIO_OUTPUT) {
                    fprintf(stderr, "removeRoute: bad route 4\n");
!                   // exit(-1);
!                   return;
                    }
              RouteList* outRoutes = src.track->outRoutes();

Index: tempo.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/tempo.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tempo.cpp	12 May 2004 21:41:06 -0000	1.6
--- tempo.cpp	14 Jul 2004 18:32:48 -0000	1.7
***************
*** 244,248 ****
              if (i == end()) {
                    printf("tick2frame(%d,0x%x): not found\n", tick, tick);
!                   abort();
                    return 0;
                    }
--- 244,248 ----
              if (i == end()) {
                    printf("tick2frame(%d,0x%x): not found\n", tick, tick);
!                   // abort();
                    return 0;
                    }

Index: app.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/app.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** app.cpp	25 Jun 2004 14:01:18 -0000	1.110
--- app.cpp	14 Jul 2004 18:32:48 -0000	1.111
***************
*** 1790,1795 ****
              fprintf(stderr, "*** experimental mode -- no play possible ***\n");
              initDummyAudio();
! //            if (!debugMode)
! //                  exit(-1);
              realTimeScheduling = true;
              }
--- 1790,1795 ----
              fprintf(stderr, "*** experimental mode -- no play possible ***\n");
              initDummyAudio();
!             // if (!debugMode)
!             //      exit(-1);
              realTimeScheduling = true;
              }

Index: conf.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/conf.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** conf.cpp	1 Jun 2004 14:25:47 -0000	1.32
--- conf.cpp	14 Jul 2004 18:32:48 -0000	1.33
***************
*** 700,704 ****
  //---------------------------------------------------------
  
! static void writeSeqConfiguration(int level, Xml& xml)
        {
        xml.tag(level++, "sequencer");
--- 700,704 ----
  //---------------------------------------------------------
  
! static void writeSeqConfiguration(int level, Xml& xml, bool writePortInfo)
        {
        xml.tag(level++, "sequencer");
***************
*** 729,775 ****
        xml.intTag(level, "rcPlay",     rcPlayNote);
  
!       //
!       // write information about all midi ports, their assigned
!       // instruments and all managed midi controllers
!       //
!       for (int i = 0; i < MIDI_PORTS; ++i) {
!             bool used = false;
!             MidiTrackList* tl = song->midis();
!             for (iMidiTrack it = tl->begin(); it != tl->end(); ++it) {
!                   MidiTrack* t = *it;
!                   if (t->outPort() == i) {
!                         used = true;
!                         break;
                          }
!                   }
!             MidiPort* mport = &midiPorts[i];
!             MidiDevice* dev = mport->device();
!             if (!used && !dev)
!                   continue;
!             xml.tag(level++, "midiport idx=\"%d\"", i);
!             xml.strTag(level, "instrument", mport->instrument()->iname());
!             if (dev) {
!                   xml.strTag(level, "name",   dev->name());
!                   xml.intTag(level, "record", dev->rwFlags() & 0x2 ? 1 : 0);
!                   }
!             // write out registered controller for all channels
!             MidiCtrlValListList* vll = mport->controller();
!             for (int k = 0; k < MIDI_CHANNELS; ++k) {
!                   int min = k << 24;
!                   int max = min + 0x100000;
!                   xml.tag(level++, "channel idx=\"%d\"", k);
!                   iMidiCtrlValList s = vll->lower_bound(min);
!                   iMidiCtrlValList e = vll->lower_bound(max);
!                   if (s != e) {
!                         for (iMidiCtrlValList i = s; i != e; ++i) {
!                               xml.tag(level++, "controller id=\"%d\"", i->second->num());
!                               if (i->second->hwVal() != CTRL_VAL_UNKNOWN)
!                                     xml.intTag(level, "val", i->second->hwVal());
!                               xml.etag(level--, "controller");
                                }
                          }
!                   xml.etag(level--, "channel");
                    }
-             xml.etag(level--, "midiport");
              }
        xml.tag(level, "/sequencer");
--- 729,777 ----
        xml.intTag(level, "rcPlay",     rcPlayNote);
  
!       if (writePortInfo) {
!             //
!             // write information about all midi ports, their assigned
!             // instruments and all managed midi controllers
!             //
!             for (int i = 0; i < MIDI_PORTS; ++i) {
!                   bool used = false;
!                   MidiTrackList* tl = song->midis();
!                   for (iMidiTrack it = tl->begin(); it != tl->end(); ++it) {
!                         MidiTrack* t = *it;
!                         if (t->outPort() == i) {
!                               used = true;
!                               break;
!                               }
                          }
!                   MidiPort* mport = &midiPorts[i];
!                   MidiDevice* dev = mport->device();
!                   if (!used && !dev)
!                         continue;
!                   xml.tag(level++, "midiport idx=\"%d\"", i);
!                   xml.strTag(level, "instrument", mport->instrument()->iname());
!                   if (dev) {
!                         xml.strTag(level, "name",   dev->name());
!                         xml.intTag(level, "record", dev->rwFlags() & 0x2 ? 1 : 0);
!                         }
!                   // write out registered controller for all channels
!                   MidiCtrlValListList* vll = mport->controller();
!                   for (int k = 0; k < MIDI_CHANNELS; ++k) {
!                         int min = k << 24;
!                         int max = min + 0x100000;
!                         xml.tag(level++, "channel idx=\"%d\"", k);
!                         iMidiCtrlValList s = vll->lower_bound(min);
!                         iMidiCtrlValList e = vll->lower_bound(max);
!                         if (s != e) {
!                               for (iMidiCtrlValList i = s; i != e; ++i) {
!                                     xml.tag(level++, "controller id=\"%d\"", i->second->num());
!                                     if (i->second->hwVal() != CTRL_VAL_UNKNOWN)
!                                           xml.intTag(level, "val", i->second->hwVal());
!                                     xml.etag(level--, "controller");
!                                     }
                                }
+                         xml.etag(level--, "channel");
                          }
!                   xml.etag(level--, "midiport");
                    }
              }
        xml.tag(level, "/sequencer");
***************
*** 882,886 ****
        xml.colorTag(level, "bigtimeBackgroundcolor", config.bigTimeBackgroundColor);
  
!       writeSeqConfiguration(level, xml);
  
        DrumEdit::writeConfiguration(level, xml);
--- 884,888 ----
        xml.colorTag(level, "bigtimeBackgroundcolor", config.bigTimeBackgroundColor);
  
!       writeSeqConfiguration(level, xml, false);
  
        DrumEdit::writeConfiguration(level, xml);
***************
*** 940,944 ****
  
        arranger->writeStatus(level, xml);
!       writeSeqConfiguration(level, xml);
  
        DrumEdit::writeConfiguration(level, xml);
--- 942,946 ----
  
        arranger->writeStatus(level, xml);
!       writeSeqConfiguration(level, xml, true);
  
        DrumEdit::writeConfiguration(level, xml);

Index: song.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/song.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** song.cpp	28 Jun 2004 21:13:16 -0000	1.58
--- song.cpp	14 Jul 2004 18:32:48 -0000	1.59
***************
*** 257,261 ****
        if (i == part->events()->end()) {
              printf("Song::changeEvent(): EVENT not found !! %d\n", part->events()->size());
!             abort();
              }
        part->events()->erase(i);
--- 257,262 ----
        if (i == part->events()->end()) {
              printf("Song::changeEvent(): EVENT not found !! %d\n", part->events()->size());
!             // abort();
!             return;
              }
        part->events()->erase(i);
***************
*** 1546,1550 ****
              default:
                    fprintf(stderr, "unknown track type %d\n", track->type());
!                   abort();
              }
  
--- 1547,1552 ----
              default:
                    fprintf(stderr, "unknown track type %d\n", track->type());
!                   // abort();
!                   return;
              }
  

Index: sig.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/sig.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sig.cpp	17 Jan 2004 17:27:41 -0000	1.4
--- sig.cpp	14 Jul 2004 18:32:48 -0000	1.5
***************
*** 151,156 ****
        if (i == end()) {
              printf("ticksMeasure: not found %d\n", tick);
!             dump();
!             abort();
              }
        return ticksMeasure(i->second->z, i->second->n);
--- 151,156 ----
        if (i == end()) {
              printf("ticksMeasure: not found %d\n", tick);
!             // abort();
!             return 0;
              }
        return ticksMeasure(i->second->z, i->second->n);
***************
*** 195,199 ****
        if (i == end()) {
              printf("timesig(%d): not found\n", tick);
!             abort();
              }
        z = i->second->z;
--- 195,201 ----
        if (i == end()) {
              printf("timesig(%d): not found\n", tick);
!             // abort();
!             z = 4;
!             n = 4;
              }
        z = i->second->z;
***************
*** 210,214 ****
        if (e == end()) {
              fprintf(stderr, "tickValues(0x%x) not found(%d)\n", t, size());
!             abort();
              }
  
--- 212,220 ----
        if (e == end()) {
              fprintf(stderr, "tickValues(0x%x) not found(%d)\n", t, size());
!             // abort();
!             *bar = 0;
!             *beat = 0;
!             *tick = 0;
!             return;
              }
  
***************
*** 257,261 ****
        if (e == end()) {
              printf("SigList::raster(%x,)\n", t);
!             abort();
              }
        int delta  = t - e->second->tick;
--- 263,268 ----
        if (e == end()) {
              printf("SigList::raster(%x,)\n", t);
!             // abort();
!             return t;
              }
        int delta  = t - e->second->tick;