Changeset 323:60282fdc8511 in roaraudio

Timestamp:

07/25/08 02:18:31 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added basic strcuture for rw codecfilter CELT

Files:

• include/roaraudio/config.h.OLD (modified) (1 diff)
• roard/Makefile (modified) (1 diff)
• roard/include/codecfilter.h (modified) (1 diff)

include/roaraudio/config.h.OLD

@@ -9 +9 @@
 #define ROAR_HAVE_LIBVORBISFILE
 
+#define ROAR_HAVE_LIBCELT
+
 #define ROAR_HAVE_SAFE_OVERFLOW
 

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
+CF=codecfilter_cmd.o codecfilter_vorbis.o codecfilter_celt.o
 
+CELT_PREFIX=/home/phi/superhome/xiph/celt-test/
 #DEFINES        = -DDEBUG
 #DEFINES        = -DMONITOR_LATENCY
 INCLUDE = -I../include -I./include
-CFLAGS  = -g -Wall -O2 $(DEFINES) $(INCLUDE)
-LDFLAGS = -g -L../lib/ -lroar -lesd -lao -lvorbisfile -lm
+CFLAGS  = -g -Wall -O2 $(DEFINES) $(INCLUDE) -I$(CELT_PREFIX)/include
+LDFLAGS = -g -L../lib/ -lroar -lesd -lao -lvorbisfile -lm -L$(CELT_PREFIX)/lib -lcelt
 
 all: ${TARGETS}

roard/include/codecfilter.h

@@ -31 +31 @@
 #endif
 
+#ifdef ROAR_HAVE_LIBCELT
+#include "codecfilter_celt.h"
+#endif
 
 void print_codecfilterlist (void);