diff options
| author | Stephen Sinclair <sinclair@music.mcgill.ca> | 2013-10-11 02:06:06 +0200 |
|---|---|---|
| committer | Stephen Sinclair <sinclair@music.mcgill.ca> | 2013-10-11 02:06:06 +0200 |
| commit | 948a7eda7a295de0ac6d677822cd702029705f7a (patch) | |
| tree | ff7209dc976454025bdfe054f34e4a059979c9dd /tests/playsaw.cpp | |
| parent | fa0759941de32b91fd328c7ec412d2dd3255aa1e (diff) | |
| parent | d6fd1442b2fe1bb366c5539354eeb841fc6943a1 (diff) | |
Merge 4.0.12 into releases
Diffstat (limited to 'tests/playsaw.cpp')
| -rw-r--r-- | tests/playsaw.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/playsaw.cpp b/tests/playsaw.cpp index 2117b54..100d8d9 100644 --- a/tests/playsaw.cpp +++ b/tests/playsaw.cpp @@ -13,29 +13,29 @@ #include <cstdlib> /* -typedef signed long MY_TYPE; -#define FORMAT RTAUDIO_SINT24 -#define SCALE 2147483647.0 - -typedef char MY_TYPE; +typedef char MY_TYPE; #define FORMAT RTAUDIO_SINT8 #define SCALE 127.0 */ -typedef signed short MY_TYPE; +typedef signed short MY_TYPE; #define FORMAT RTAUDIO_SINT16 #define SCALE 32767.0 /* -typedef signed long MY_TYPE; +typedef S24 MY_TYPE; +#define FORMAT RTAUDIO_SINT24 +#define SCALE 8388607.0 + +typedef signed long MY_TYPE; #define FORMAT RTAUDIO_SINT32 #define SCALE 2147483647.0 -typedef float MY_TYPE; +typedef float MY_TYPE; #define FORMAT RTAUDIO_FLOAT32 #define SCALE 1.0 -typedef double MY_TYPE; +typedef double MY_TYPE; #define FORMAT RTAUDIO_FLOAT64 #define SCALE 1.0 */ @@ -88,7 +88,7 @@ int saw( void *outputBuffer, void *inputBuffer, unsigned int nBufferFrames, for ( i=0; i<nBufferFrames; i++ ) { for ( j=0; j<channels; j++ ) { - *buffer++ = (MY_TYPE) (lastValues[j] * SCALE); + *buffer++ = (MY_TYPE) (lastValues[j] * SCALE * 0.5); lastValues[j] += BASE_RATE * (j+1+(j*0.1)); if ( lastValues[j] >= 1.0 ) lastValues[j] -= 2.0; } @@ -116,7 +116,7 @@ int saw( void *outputBuffer, void *inputBuffer, unsigned int nBufferFrames, for ( j=0; j<channels; j++ ) { increment = BASE_RATE * (j+1+(j*0.1)); for ( i=0; i<nBufferFrames; i++ ) { - *buffer++ = (MY_TYPE) (lastValues[j] * SCALE); + *buffer++ = (MY_TYPE) (lastValues[j] * SCALE * 0.5); lastValues[j] += increment; if ( lastValues[j] >= 1.0 ) lastValues[j] -= 2.0; } @@ -163,7 +163,7 @@ int main( int argc, char *argv[] ) oParams.nChannels = channels; oParams.firstChannel = offset; - options.flags |= RTAUDIO_HOG_DEVICE; + options.flags = RTAUDIO_HOG_DEVICE; options.flags |= RTAUDIO_SCHEDULE_REALTIME; #if !defined( USE_INTERLEAVED ) options.flags |= RTAUDIO_NONINTERLEAVED; |