Changeset 950:9cfbc109ff1b in roaraudio

Timestamp:

12/08/08 00:57:37 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

started libshout driver

Location:

roard

Files:

• Makefile (modified) (2 diffs)
• driver_shout.c (added)
• include/driver.h (modified) (1 diff)
• include/driver_shout.h (added)

roard/Makefile

@@ -2 +2 @@
 
 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 driver_oss.o
+DRV=driver_esd.o driver_ao.o driver_roar.o driver_raw.o driver_oss.o driver_shout.o
 CF=codecfilter_cmd.o codecfilter_vorbis.o codecfilter_celt.o codecfilter_speex.o codecfilter_wave.o codecfilter_alaw.o codecfilter_mulaw.o codecfilter_sndfile.o
 
@@ -11 +11 @@
 INCLUDE = -I../include -I./include
 CFLAGS += -g -Wall -O2 $(DEFINES) $(INCLUDE) $(INCPATH)
-LDFLAGS = -g -L../lib/ $(LDPATH) -lroar -lroardsp $(lib_esd) $(lib_ossaudio) $(lib_ao) $(lib_vorbisfile) $(lib_vorbisenc) -lm $(lib_celt) $(lib_speex) $(lib_vorbis) $(lib_sndfile)
+LDFLAGS = -g -L../lib/ $(LDPATH) -lroar -lroardsp $(lib_esd) $(lib_ossaudio) $(lib_ao) $(lib_vorbisfile) $(lib_vorbisenc) -lm $(lib_celt) $(lib_speex) $(lib_vorbis) $(lib_sndfile) $(lib_shout)
 
 all: ${TARGETS}

roard/include/driver.h

@@ -60 +60 @@
 #endif
 
+#ifdef ROAR_HAVE_LIBSHOUT
+#include <shout/shout.h>
+#include "driver_shout.h"
+#endif
+
 #if defined(ROAR_HAVE_OSS_BSD) || defined(ROAR_HAVE_OSS)
 #if defined(__OpenBSD__) || defined(__NetBSD__)