Changeset 2945:4ee3f04d27dd in roaraudio

Timestamp:

10/16/09 23:27:23 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added dummy files (waveform.[ch]) for waveform subsystem

Location:

roard

Files:

• Makefile (modified) (1 diff)
• include/roard.h (modified) (1 diff)
• include/waveform.h (added)
• roard.c (modified) (2 diffs)
• waveform.c (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 lib.o ssynth.o container_framework.o
-SUBSYS=midi.o light.o raw.o rdtcs.o
+SUBSYS=midi.o light.o raw.o rdtcs.o waveform.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
 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

roard/include/roard.h

@@ -105 +105 @@
 #include "raw.h"
 #include "rdtcs.h"
+#include "waveform.h"
 #include "lib.h"
 

roard/roard.c

@@ -1399 +1399 @@
  ROAR_DBG("Server config: rate=%i, bits=%i, chans=%i", sa.rate, sa.bits, sa.channels);
 
+ if ( waveform_init() == -1 ) {
+  ROAR_ERR("Can not initialize Waveform subsystem");
+  return 1;
+ }
+
 #ifndef ROAR_WITHOUT_DCOMP_MIDI
  if ( midi_init() == -1 ) {
@@ -1677 +1682 @@
 #endif
 
+ waveform_free();
+
 #ifdef SUPPORT_PIDFILE
  if ( pidfile != NULL )