Changeset 4590:745138c9da88 in roaraudio

Timestamp:

11/07/10 05:07:45 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added FLAC support

Files:

• ChangeLog (modified) (1 diff)
• roard/Makefile (modified) (1 diff)
• roard/codecfilter.c (modified) (2 diffs)
• roard/codecfilter_flac.c (added)
• roard/include/codecfilter.h (modified) (1 diff)
• roard/include/codecfilter_flac.h (added)

ChangeLog

@@ -4 +4 @@
         * Added support for CRC24 (RFC 4880)
         * Added Base64 support.
+        * Added codecfilter for FLAC (read-only, native FLAC).
 
 v. 0.4beta1 - Mon Nov 01 2010 16:14 CET

roard/Makefile

@@ -4 +4 @@
 SUBSYS=midi.o light.o raw.o rdtcs.o waveform.o beep.o
 DRV=driver_esd.o driver_ao.o driver_roar.o driver_raw.o driver_oss.o driver_shout.o driver_sndio.o driver_dmx.o driver_pwmled.o driver_sysclock.o driver_wmm.o driver_dstr.o driver_alsa.o driver_rsound.o driver_portaudio.o driver_pulsesimple.o driver_jack.o
-CF_CODEC=codecfilter_cmd.o codecfilter_vorbis.o codecfilter_celt.o codecfilter_speex.o codecfilter_alaw.o codecfilter_mulaw.o codecfilter_sndfile.o codecfilter_fishsound.o
+CF_CODEC=codecfilter_cmd.o codecfilter_vorbis.o codecfilter_celt.o codecfilter_speex.o codecfilter_alaw.o codecfilter_mulaw.o codecfilter_sndfile.o codecfilter_fishsound.o codecfilter_flac.o
 CF_CONTAINER=codecfilter_wave.o codecfilter_raum.o codecfilter_au.o
 EMUL=emul_esd.o emul_simple.o emul_rsound.o emul_rplay.o

roard/codecfilter.c

@@ -189 +189 @@
 
 #ifndef ROAR_WITHOUT_CF_CMD
-#ifdef ROAR_HAVE_BIN_FLAC
+#if defined(ROAR_HAVE_BIN_FLAC) && !defined(ROAR_HAVE_LIBFLAC)
  {ROAR_CODEC_FLAC, "cmd",  "flac",
 #if BYTE_ORDER == BIG_ENDIAN
@@ -201 +201 @@
   cf_cmd_open, NULL, NULL, NULL, NULL, NULL, codecfilter_delay_fulldyn, NULL},
 #endif
+#endif
+
+#ifdef ROAR_HAVE_LIBFLAC
+ {ROAR_CODEC_FLAC, "FLAC", "flac codec", NULL, NULL, ROAR_CODECFILTER_READ, ROAR_SUBSYS_WAVEFORM,
+  cf_flac_open, cf_flac_close, NULL, NULL, cf_flac_read, NULL, codecfilter_delay_fulldyn, NULL},
 #endif
 

roard/include/codecfilter.h

@@ -110 +110 @@
 #endif
 
+#ifdef ROAR_HAVE_LIBFLAC
+#include "codecfilter_flac.h"
+#endif
+
 #include "container_framework.h"