[Lmuse-cvs-traffic] muse/muse midi.cpp,1.42,1.43 node.cpp,1.35,1.36 wavetrack.cpp,1.14,1.15

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

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

Modified Files:
	midi.cpp node.cpp wavetrack.cpp 
Log Message:
hide warning


Index: wavetrack.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/wavetrack.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wavetrack.cpp	14 Jul 2004 15:27:26 -0000	1.14
--- wavetrack.cpp	18 Jul 2004 10:26:19 -0000	1.15
***************
*** 13,16 ****
--- 13,17 ----
  #include "xml.h"
  #include "song.h"
+ #include "globals.h"
  
  bool WaveTrack::firstWaveTrack = true;
***************
*** 188,191 ****
--- 189,202 ----
                                printf("fifo get error expected %d, got %d\n",
                                   framePos, pos);
+                               if (debugMsg)
+                                     printf("fifo get error expected %d, got %d\n",
+                                        framePos, pos);
+                               while (pos < framePos) {
+                                     if (_prefetchFifo.get(channels, nframe, bp, &pos)) {
+                                           printf("WaveTrack::getData(%s) fifo underrun\n",
+                                              name().latin1());
+                                           return false;
+                                           }
+                                     }
                                }
                          }
***************
*** 195,199 ****
              }
        else {
- //            long unsigned pos;
              if (audio->freewheel()) {
                    // when freewheeling, read data direct from file:
--- 206,209 ----
***************
*** 208,213 ****
                          }
                    if (pos != framePos) {
!                         printf("fifo get error expected %d, got %d\n",
!                            framePos, pos);
                          }
                    }
--- 218,231 ----
                          }
                    if (pos != framePos) {
!                         if (debugMsg)
!                               printf("fifo get error expected %d, got %d\n",
!                                  framePos, pos);
!                         while (pos < framePos) {
!                               if (_prefetchFifo.get(channels, nframe, bp, &pos)) {
!                                     printf("WaveTrack::getData(%s) fifo underrun\n",
!                                        name().latin1());
!                                     return false;
!                                     }
!                               }
                          }
                    }

Index: node.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/node.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** node.cpp	14 Jul 2004 15:27:26 -0000	1.35
--- node.cpp	18 Jul 2004 10:26:19 -0000	1.36
***************
*** 832,837 ****
              return true;
              }
- //      printf("FIFO %p put %d\n", this, muse_atomic_read(&count));
- 
        FifoBuffer* b = buffer[widx];
        int n         = segs * samples;
--- 832,835 ----

Index: midi.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midi.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** midi.cpp	16 Jul 2004 23:31:42 -0000	1.42
--- midi.cpp	18 Jul 2004 10:26:19 -0000	1.43
***************
*** 634,638 ****
                    printf("processMidi: FATAL: cur > next %d > %d\n",
                       cts, nts);
!                   exit(-1);
                    }
              unsigned offset = delay + partTick;
--- 634,638 ----
                    printf("processMidi: FATAL: cur > next %d > %d\n",
                       cts, nts);
!                   return;
                    }
              unsigned offset = delay + partTick;