Changeset 851:06cbae08cea5 in roaraudio

Timestamp:

09/28/08 12:48:14 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use libsndfile for ROAR_CODEC_RIFF_WAVE if avalible, does not support vio! :(

Location:

roard

Files:

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

roard/Makefile

@@ -3 +3 @@
 OBJ=roard.o driver.o mixer.o output.o signals.o loop.o clients.o streams.o network.o commands.o req.o sources.o sample.o meta.o codecfilter.o midi.o lib.o
 DRV=driver_esd.o driver_ao.o driver_roar.o driver_raw.o
-CF=codecfilter_cmd.o codecfilter_vorbis.o codecfilter_celt.o codecfilter_speex.o codecfilter_wave.o codecfilter_alaw.o
+CF=codecfilter_cmd.o codecfilter_vorbis.o codecfilter_celt.o codecfilter_speex.o codecfilter_wave.o codecfilter_alaw.o codecfilter_sndfile.o
 
 include ../Makefile.conf
@@ -11 +11 @@
 INCLUDE = -I../include -I./include
 CFLAGS += -g -Wall -O2 $(DEFINES) $(INCLUDE) $(INCPATH)
-LDFLAGS = -g -L../lib/ $(LDPATH) -lroar -lroardsp $(lib_esd) $(lib_ao) $(lib_vorbisfile) $(lib_vorbisenc) -lm $(lib_celt) $(lib_speex) $(lib_vorbis)
+LDFLAGS = -g -L../lib/ $(LDPATH) -lroar -lroardsp $(lib_esd) $(lib_ao) $(lib_vorbisfile) $(lib_vorbisenc) -lm $(lib_celt) $(lib_speex) $(lib_vorbis) $(lib_sndfile)
 
 all: ${TARGETS}

roard/codecfilter.c

@@ -28 +28 @@
  {-1,                     "null", "null codec filter", NULL, ROAR_CODECFILTER_NONE, NULL, NULL, NULL, NULL, NULL, NULL},
 
+#ifdef ROAR_HAVE_LIBSNDFILE
+ {ROAR_CODEC_RIFF_WAVE, "sndfile", "libsndfile codec filter", NULL, ROAR_CODECFILTER_READ,
+  cf_sndfile_open, cf_sndfile_close, NULL, NULL, cf_sndfile_read, NULL},
+#else
  {ROAR_CODEC_RIFF_WAVE, "RIFF/WAVE", "RIFF/WAVE", NULL, ROAR_CODECFILTER_READ,
   cf_wave_open, cf_wave_close, NULL, NULL, cf_wave_read, NULL},
+#endif
 
  {ROAR_CODEC_ALAW, "alaw", "A-Law", NULL, ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE,

roard/include/codecfilter.h

@@ -69 +69 @@
 #endif
 
+#ifdef ROAR_HAVE_LIBSNDFILE
+#include "codecfilter_sndfile.h"
+#endif
+
 //cf alaw:
 #include <libroardsp/libroardsp.h>