Changeset 1208:3ed0b4a1da52 in roaraudio

Timestamp:

02/04/09 17:46:44 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to select a default codec for the default output driver

Files:

• configure (modified) (4 diffs)
• roard/roard.c (modified) (5 diffs)

configure

@@ -61 +61 @@
 
 ROAR_DRIVER_DEFAULT=''
+ROAR_DRIVER_CODEC=''
 
 echo -n "checking for C compiler... "
@@ -121 +122 @@
    echo '--default-bits BITS         - Set default number of bits per sample for roard and roarclients'
    echo '--default-driver DRIVER     - Set default driver for roard'
+   echo '--default-codec CODEC       - Set default codec used for the default driver'
    echo
    echo '--without-alaw              - Disable support of A-Law codec (de- and encoding)'
@@ -197 +199 @@
   '--default-driver')
    ROAR_DRIVER_DEFAULT="$2"
+   shift;
+  ;;
+  '--default-codec')
+   ROAR_DRIVER_CODEC="$2"
    shift;
   ;;
@@ -452 +458 @@
  [ "$DEFAULT_BITS"        = '' ] || echo "#define ROAR_BITS_DEFAULT     $DEFAULT_BITS"
  [ "$ROAR_DRIVER_DEFAULT" = '' ] || echo "#define ROAR_DRIVER_DEFAULT   \"$ROAR_DRIVER_DEFAULT\""
+ [ "$ROAR_DRIVER_CODEC"   = '' ] || echo "#define ROAR_DRIVER_CODEC     \"$ROAR_DRIVER_CODEC\""
  echo
  $ALAW     && echo '#define ROAR_SUPPORT_ALAW'

roard/roard.c

@@ -129 +129 @@
  struct roar_stream_server * ss;
  char * k, * v;
+#ifdef ROAR_DRIVER_CODEC
+ char * to_free = NULL;
+#endif
  int codec;
  int sync = 0;
@@ -138 +141 @@
   prim = 1;
   sync = 1;
+
+#ifdef ROAR_DRIVER_CODEC
+  if ( opts == NULL ) {
+   opts = to_free = strdup("codec=" ROAR_DRIVER_CODEC);
+  }
+#endif
  }
 
@@ -177 +186 @@
     streams_delete(stream);
     if ( prim ) alive = 0;
+#ifdef ROAR_DRIVER_CODEC
+    if ( to_free != NULL )
+     free(to_free);
+#endif
     return -1;
    }
@@ -187 +200 @@
    streams_delete(stream);
    if ( prim ) alive = 0;
+#ifdef ROAR_DRIVER_CODEC
+   if ( to_free != NULL )
+    free(to_free);
+#endif
    return -1;
   }
@@ -192 +209 @@
   k = strtok(NULL, ",");
  }
+
+#ifdef ROAR_DRIVER_CODEC
+ if ( to_free != NULL )
+  free(to_free);
+#endif
 
  if ( codec == ROAR_CODEC_ALAW || codec == ROAR_CODEC_MULAW )