Changeset 1062:deda1a0a6776 in roaraudio

Timestamp:

12/24/08 15:25:11 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to set default rate/channels/bits, make ROAR_OUTPUT_BUFFER_SAMPLES depend on default rate and init $XMMS_INST_DIR in configure script

Files:

• configure (modified) (4 diffs)
• include/roaraudio/audio.h (modified) (1 diff)
• roard/include/output.h (modified) (1 diff)

configure

@@ -36 +36 @@
 
 AO_INST_DIR=''
+XMMS_INST_DIR=''
+
+DEFAULT_RATE=''
+DEFAULT_CHANNELS=''
+DEFAULT_BITS=''
 
 echo -n "checking for C compiler... "
@@ -86 +91 @@
    echo '--prefix-inc DIR'
    echo '--prefix-man DIR'
+   echo '--default-rate RATE'
+   echo '--default-channels CHANNELS'
+   echo '--default-bits BITS'
    exit 0;
   ;;
@@ -130 +138 @@
   '--xmms-install-dir')
    XMMS_INST_DIR="$2"
+   shift;
+  ;;
+  '--default-rate')
+   DEFAULT_RATE="$2"
+   shift;
+  ;;
+  '--default-channels')
+   DEFAULT_CHANNELS="$2"
+   shift;
+  ;;
+  '--default-bits')
+   DEFAULT_BITS="$2"
    shift;
   ;;
@@ -323 +343 @@
  echo '/* uname: ' $(uname -a) '*/'
  echo '/* Date : ' $(date)  '*/'
+ echo
+ [ "$DEFAULT_RATE"     = '' ] || echo "#define ROAR_RATE_DEFAULT     $DEFAULT_RATE"
+ [ "$DEFAULT_CHANNELS" = '' ] || echo "#define ROAR_CHANNELS_DEFAULT $DEFAULT_CHANNELS"
+ [ "$DEFAULT_BITS"     = '' ] || echo "#define ROAR_BITS_DEFAULT     $DEFAULT_BITS"
  echo
 } >&3

include/roaraudio/audio.h

@@ -141 +141 @@
 #define ROAR_BITS_MAX             32
 
+#ifndef ROAR_BITS_DEFAULT
 #define ROAR_BITS_DEFAULT         16
+#endif
+#ifndef ROAR_CHANNELS_DEFAULT
 #define ROAR_CHANNELS_DEFAULT      2
+#endif
+#ifndef ROAR_RATE_DEFAULT
 #define ROAR_RATE_DEFAULT      44100
+#endif
 
 #define ROAR_MAX_CHANNELS         64

roard/include/output.h

@@ -33 +33 @@
 #define ROAR_OUTPUT_BUFFER_SAMPLES 2048
 #else
-#define ROAR_OUTPUT_BUFFER_SAMPLES 441
+//#define ROAR_OUTPUT_BUFFER_SAMPLES 441
+#define ROAR_OUTPUT_BUFFER_SAMPLES (ROAR_RATE_DEFAULT/100)
 #endif