Changeset 749:2b25ecdfb97b in roaraudio

Timestamp:

09/05/08 01:37:26 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use compile time detected set of tools for cmd codec filters

File:

• roard/codecfilter.c (modified) (4 diffs)

roard/codecfilter.c

@@ -34 +34 @@
   cf_alaw_open, cf_alaw_close, NULL, NULL, cf_alaw_read, NULL},
 
+#ifdef ROAR_HAVE_BIN_OGG123
  {ROAR_CODEC_OGG_GENERAL, "cmd",  "ogg123",
-  "ogg123 -q -d raw -f - -", ROAR_CODECFILTER_READ,
+  ROAR_HAVE_BIN_OGG123 " -q -d raw -f - -", ROAR_CODECFILTER_READ,
   cf_cmd_open, NULL, NULL, NULL, NULL, NULL},
+#endif
 
 #ifdef ROAR_HAVE_LIBVORBISFILE
@@ -48 +50 @@
 #endif
 
+#ifdef ROAR_HAVE_BIN_TIMIDITY
  {ROAR_CODEC_MIDI_FILE, "MIDIFILE", "timidity MIDI synth",
-  "timidity -Or1sl -s %R -o - -", ROAR_CODECFILTER_READ,
+  ROAR_HAVE_BIN_TIMIDITY " -Or1sl -s %R -o - -", ROAR_CODECFILTER_READ,
   cf_cmd_open, NULL, NULL, NULL, NULL, NULL},
+#endif
 
 #ifdef ROAR_HAVE_LIBCELT
@@ -62 +66 @@
 #endif
 
+#ifdef ROAR_HAVE_BIN_FLAC
  {ROAR_CODEC_FLAC, "cmd",  "flac",
 #if BYTE_ORDER == BIG_ENDIAN
-  "flac --silent --force-raw-format --sign=signed --endian=big -d - -o -",
+  ROAR_HAVE_BIN_FLAC " --silent --force-raw-format --sign=signed --endian=big -d - -o -",
 #elif BYTE_ORDER == LITTLE_ENDIAN
-  "flac --silent --force-raw-format --sign=signed --endian=little -d - -o -",
+  ROAR_HAVE_BIN_FLAC " --silent --force-raw-format --sign=signed --endian=little -d - -o -",
 #else
   "false",
@@ -72 +77 @@
   ROAR_CODECFILTER_READ,
   cf_cmd_open, NULL, NULL, NULL, NULL, NULL},
+#endif
 
  {-1, NULL, NULL, NULL, ROAR_CODECFILTER_NONE, NULL, NULL, NULL, NULL, NULL, NULL} // end of list