Update of /cvsroot/lmuse/muse/muse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10686/muse
Modified Files:
Tag: REL07
app.cpp audioprefetch.cpp globals.cpp globals.h node.cpp
node.h wave.cpp wavetrack.cpp
Log Message:
Disabled enablement and enabled disablement
for more information ask at the front desk on floor 231...
or see the ChangeLog
Index: app.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/app.cpp,v
retrieving revision 1.113.2.23
retrieving revision 1.113.2.24
diff -C2 -d -r1.113.2.23 -r1.113.2.24
*** app.cpp 26 Dec 2005 21:13:21 -0000 1.113.2.23
--- app.cpp 28 Dec 2005 22:17:55 -0000 1.113.2.24
***************
*** 1931,1934 ****
--- 1931,1937 ----
else
realTimeScheduling = audioDevice->isRealtime();
+
+ // setup the prefetch fifo length now that the segmentSize is known
+ fifoLength = 131072/segmentSize;
argc -= optind;
++argc;
Index: node.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/Attic/node.cpp,v
retrieving revision 1.36.2.3
retrieving revision 1.36.2.4
diff -C2 -d -r1.36.2.3 -r1.36.2.4
*** node.cpp 13 Dec 2005 20:56:14 -0000 1.36.2.3
--- node.cpp 28 Dec 2005 22:17:55 -0000 1.36.2.4
***************
*** 818,822 ****
{
muse_atomic_init(&count);
! nbuffer = FIFO_BUFFER;
buffer = new FifoBuffer*[nbuffer];
for (int i = 0; i < nbuffer; ++i)
--- 818,823 ----
{
muse_atomic_init(&count);
! //nbuffer = FIFO_BUFFER;
! nbuffer = fifoLength;
buffer = new FifoBuffer*[nbuffer];
for (int i = 0; i < nbuffer; ++i)
Index: node.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/Attic/node.h,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** node.h 14 Jul 2004 15:27:26 -0000 1.8
--- node.h 28 Dec 2005 22:17:55 -0000 1.8.2.1
***************
*** 85,89 ****
class SndFile;
! const int FIFO_BUFFER = 64;
//---------------------------------------------------------
--- 85,90 ----
class SndFile;
! // superceeded by dynamic allocation of fifoLength
! //const int FIFO_BUFFER = 4096;//64;
//---------------------------------------------------------
Index: wavetrack.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/wavetrack.cpp,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** wavetrack.cpp 18 Jul 2004 10:26:19 -0000 1.15
--- wavetrack.cpp 28 Dec 2005 22:17:55 -0000 1.15.2.1
***************
*** 15,20 ****
#include "globals.h"
- bool WaveTrack::firstWaveTrack = true;
-
//---------------------------------------------------------
// fetchData
--- 15,18 ----
Index: globals.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/globals.cpp,v
retrieving revision 1.15.2.4
retrieving revision 1.15.2.5
diff -C2 -d -r1.15.2.4 -r1.15.2.5
*** globals.cpp 13 Jul 2005 23:02:21 -0000 1.15.2.4
--- globals.cpp 28 Dec 2005 22:17:55 -0000 1.15.2.5
***************
*** 18,21 ****
--- 18,23 ----
int sampleRate = 44100;
unsigned segmentSize = 1024U; // segmentSize in frames (set by JACK)
+ unsigned fifoLength = 128; // 131072/segmentSize
+ // 131072 - magic number that gives a sufficient buffer size
int segmentCount = 2;
Index: globals.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/globals.h,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -C2 -d -r1.10.2.3 -r1.10.2.4
*** globals.h 13 Jun 2005 18:30:48 -0000 1.10.2.3
--- globals.h 28 Dec 2005 22:17:55 -0000 1.10.2.4
***************
*** 24,27 ****
--- 24,28 ----
extern int sampleRate;
extern unsigned segmentSize;
+ extern unsigned fifoLength; // inversely proportional to segmentSize
extern int segmentCount;
Index: audioprefetch.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/audioprefetch.cpp,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -d -r1.14.2.1 -r1.14.2.2
*** audioprefetch.cpp 4 Jun 2005 19:25:15 -0000 1.14.2.1
--- audioprefetch.cpp 28 Dec 2005 22:17:55 -0000 1.14.2.2
***************
*** 180,184 ****
track->clearPrefetchFifo();
}
! for (int i = 0; i < (FIFO_BUFFER-1); ++i)
prefetch();
seekPos = seekTo;
--- 180,184 ----
track->clearPrefetchFifo();
}
! for (int i = 0; i < (fifoLength-1); ++i)
prefetch();
seekPos = seekTo;
Index: wave.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/wave.cpp,v
retrieving revision 1.19.2.7
retrieving revision 1.19.2.8
diff -C2 -d -r1.19.2.7 -r1.19.2.8
*** wave.cpp 13 Dec 2005 20:56:14 -0000 1.19.2.7
--- wave.cpp 28 Dec 2005 22:17:55 -0000 1.19.2.8
***************
*** 376,380 ****
size_t SndFile::read(int srcChannels, float** dst, size_t n)
{
! float buffer[n * sfinfo.channels];
size_t rn = sf_readf_float(sf, buffer, n);
float* src = buffer;
--- 376,381 ----
size_t SndFile::read(int srcChannels, float** dst, size_t n)
{
! float *buffer = new float[n * sfinfo.channels];
! //float buffer[n * sfinfo.channels];
size_t rn = sf_readf_float(sf, buffer, n);
float* src = buffer;
***************
*** 404,407 ****
--- 405,409 ----
srcChannels, dstChannels);
}
+ delete buffer;
return rn;
}
***************
*** 419,424 ****
{
int dstChannels = sfinfo.channels;
! float buffer[n * dstChannels];
! float* dst = buffer;
const float limitValue=0.99;
--- 421,427 ----
{
int dstChannels = sfinfo.channels;
! //float buffer[n * dstChannels];
! float *buffer = new float[n * dstChannels];
! float *dst = buffer;
const float limitValue=0.99;
***************
*** 460,466 ****
printf("SndFile:write channel mismatch %d -> %d\n",
srcChannels, dstChannels);
return 0;
}
! return sf_writef_float(sf, buffer, n) ;
}
--- 463,472 ----
printf("SndFile:write channel mismatch %d -> %d\n",
srcChannels, dstChannels);
+ delete buffer;
return 0;
}
! int nbr = sf_writef_float(sf, buffer, n) ;
! delete buffer;
! return nbr;
}
|