Changeset 612:5ab0ccdc9e13 in roaraudio

Timestamp:

08/19/08 22:06:18 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added flags to codecfilter list

Location:

roard

Files:

• codecfilter.c (modified) (2 diffs)
• include/codecfilter.h (modified) (2 diffs)

roard/codecfilter.c

@@ -4 +4 @@
 
 struct roar_codecfilter g_codecfilter[] = {
- {-1,                     "null", "null codec filter", NULL,                      NULL, NULL, NULL, NULL, NULL, NULL},
+ {-1,                     "null", "null codec filter", NULL, ROAR_CODECFILTER_NONE, NULL, NULL, NULL, NULL, NULL, NULL},
 
- {ROAR_CODEC_RIFF_WAVE, "RIFF/WAVE", "RIFF/WAVE", NULL,
+ {ROAR_CODEC_RIFF_WAVE, "RIFF/WAVE", "RIFF/WAVE", NULL, ROAR_CODECFILTER_READ,
   cf_wave_open, cf_wave_close, NULL, NULL, cf_wave_read, NULL},
 
  {ROAR_CODEC_OGG_GENERAL, "cmd",  "ogg123",
-  "ogg123 -q -d raw -f - -",
+  "ogg123 -q -d raw -f - -", ROAR_CODECFILTER_READ,
   cf_cmd_open, NULL, NULL, NULL, NULL, NULL},
 
 #ifdef ROAR_HAVE_LIBVORBISFILE
  {ROAR_CODEC_OGG_VORBIS, "oggvorbis", "Ogg Vorbis decoder", NULL,
+#ifdef ROAR_HAVE_LIBVORBISENC
+ ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE,
+#else
+ ROAR_CODECFILTER_READ,
+#endif
  cf_vorbis_open, cf_vorbis_close, NULL, cf_vorbis_write, cf_vorbis_read, NULL},
 #endif
 
  {ROAR_CODEC_MIDI_FILE, "MIDIFILE", "timidity MIDI synth",
-  "timidity -Or1sl -s %R -o - -",
+  "timidity -Or1sl -s %R -o - -", ROAR_CODECFILTER_READ,
   cf_cmd_open, NULL, NULL, NULL, NULL, NULL},
 
 #ifdef ROAR_HAVE_LIBCELT
- {ROAR_CODEC_ROAR_CELT, "RoarCELT", "RoarAudio CELT", NULL,
+ {ROAR_CODEC_ROAR_CELT, "RoarCELT", "RoarAudio CELT", NULL, ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE,
   cf_celt_open, cf_celt_close, NULL, cf_celt_write, cf_celt_read, NULL},
 #endif
 
 #ifdef ROAR_HAVE_LIBSPEEX
- {ROAR_CODEC_ROAR_SPEEX, "RoarSPEEX", "RoarAudio SPEEX", NULL,
+ {ROAR_CODEC_ROAR_SPEEX, "RoarSPEEX", "RoarAudio SPEEX", NULL, ROAR_CODECFILTER_READ,
   cf_speex_open, cf_speex_close, NULL, NULL, cf_speex_read, NULL},
 #endif
 
- {ROAR_CODEC_FLAC, "cmd",  "ogg123",
+ {ROAR_CODEC_FLAC, "cmd",  "flac",
 #if BYTE_ORDER == BIG_ENDIAN
   "flac --silent --force-raw-format --sign=signed --endian=big -d - -o -",
@@ -40 +45 @@
   "false",
 #endif
+  ROAR_CODECFILTER_READ,
   cf_cmd_open, NULL, NULL, NULL, NULL, NULL},
 
- {-1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL} // end of list
+ {-1, NULL, NULL, NULL, ROAR_CODECFILTER_NONE, NULL, NULL, NULL, NULL, NULL, NULL} // end of list
 };
 

roard/include/codecfilter.h

@@ -10 +10 @@
 struct roar_stream_server;
 
+#define ROAR_CODECFILTER_NONE  0
+#define ROAR_CODECFILTER_READ  1
+#define ROAR_CODECFILTER_WRITE 2
+
 struct roar_codecfilter {
  int    codec;
@@ -15 +19 @@
  char * desc;
  char * options;
+ int    flags;
  int (*open )(CODECFILTER_USERDATA_T * inst, int codec,
                                              struct roar_stream_server * info,