Changeset 1199:6eb25a4ffe7a in roaraudio

Timestamp:

02/04/09 16:55:06 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to disable cmd codecfilter

Files:

• configure (modified) (4 diffs)
• roard/codecfilter.c (modified) (6 diffs)
• roard/codecfilter_cmd.c (modified) (2 diffs)

configure

@@ -52 +52 @@
 PROXY=true
 
+WITHOUT_CF=''
+
 MINIMAL=false
 
@@ -126 +128 @@
    echo '--without-proxy             - Disable support for proxys'
    echo
+   echo '--without-cf-cmd            - Disable support for command codecfilter'
+   echo
    echo '--without-libao             - Disable build of libao plugin'
    echo '--without-xmms              - Disable build of XMMS plugin'
@@ -211 +215 @@
   '--without-proxy')
    PROXY=false
+  ;;
+  '--without-cf-'*)
+   WITHOUT_CF="$WITHOUT_CF"' '$(echo "$1" | cut -d- -f5)
   ;;
   '--without-libao')
@@ -451 +458 @@
  $MULAW_RW && echo '#define ROAR_SUPPORT_MULAW_RW'
  $PROXY    && echo '#define ROAR_SUPPORT_PROXY'
+ echo
+
+ for i in $WITHOUT_CF
+ do
+  i=$(echo $i | tr /a-z/ /A-Z/);
+  echo '#define ROAR_WITHOUT_CF_'$i
+ done
+
  echo
  $TARGET_WIN32 && echo '#define ROAR_TARGET_WIN32'

roard/codecfilter.c

@@ -73 +73 @@
 #endif
 
+#ifndef ROAR_WITHOUT_CF_CMD
 #ifdef ROAR_HAVE_BIN_OGG123
  {ROAR_CODEC_OGG_GENERAL, "cmd",  "ogg123",
   ROAR_HAVE_BIN_OGG123 " -q -d raw -f - -", ROAR_CODECFILTER_READ,
   cf_cmd_open, NULL, NULL, NULL, NULL, NULL, codecfilter_delay_fulldyn},
+#endif
 #endif
 
@@ -88 +90 @@
  cf_vorbis_open, cf_vorbis_close, NULL, cf_vorbis_write, cf_vorbis_read, NULL, codecfilter_delay_fulldyn},
 #else
+#ifndef ROAR_WITHOUT_CF_CMD
 #ifdef ROAR_HAVE_BIN_OGG123
  {ROAR_CODEC_OGG_VORBIS, "cmd",  "ogg123",
   ROAR_HAVE_BIN_OGG123 " -q -d raw -f - -", ROAR_CODECFILTER_READ,
   cf_cmd_open, NULL, NULL, NULL, NULL, NULL, codecfilter_delay_fulldyn},
+#endif
 #endif
 #endif
@@ -105 +109 @@
 #endif
 
+#ifndef ROAR_WITHOUT_CF_CMD
 #ifdef ROAR_HAVE_BIN_TIMIDITY
  {ROAR_CODEC_MIDI_FILE, "MIDIFILE", "timidity MIDI synth",
@@ -110 +115 @@
   cf_cmd_open, NULL, NULL, NULL, NULL, NULL, codecfilter_delay_fulldyn},
 #endif
+#endif
 
 #ifdef ROAR_HAVE_LIBCELT
@@ -121 +127 @@
 #endif
 
+#ifndef ROAR_WITHOUT_CF_CMD
 #ifdef ROAR_HAVE_BIN_FLAC
  {ROAR_CODEC_FLAC, "cmd",  "flac",
@@ -132 +139 @@
   ROAR_CODECFILTER_READ,
   cf_cmd_open, NULL, NULL, NULL, NULL, NULL, codecfilter_delay_fulldyn},
+#endif
 #endif
 

roard/codecfilter_cmd.c

@@ -24 +24 @@
 
 #include "roard.h"
+
+#ifndef ROAR_WITHOUT_CF_CMD
 
 #define CMDMAXLEN 1024
@@ -109 +111 @@
 }
 
+#endif
+
 //ll