Changeset 4490:3bf316842494 in roaraudio


Ignore:
Timestamp:
10/12/10 04:15:19 (8 years ago)
Author:
phi
Branch:
default
Message:

added some dummy files for jack

Location:
roard
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • roard/Makefile

    r4469 r4490  
    33OBJ=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 plugins.o memlock.o hwmixer.o auth.o 
    44SUBSYS=midi.o light.o raw.o rdtcs.o waveform.o beep.o 
    5 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 
     5DRV=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 
    66CF_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 
    77CF_CONTAINER=codecfilter_wave.o codecfilter_raum.o codecfilter_au.o 
     
    2020CFLAGS   += -g -Wall -O2 $(DEFINES) $(PKGDEFINES) $(INCLUDE) $(INCPATH) 
    2121LDFLAGS   = -g -rdynamic -L../lib/ $(LDPATH) 
    22 DRVLIBS   = $(lib_esd) $(lib_ossaudio) $(lib_ao) $(lib_shout) $(lib_sndio) $(lib_rsound) $(lib_portaudio) $(lib_pablio) $(lib_asound) $(lib_winmm) $(lib_pulse_simple) 
     22DRVLIBS   = $(lib_esd) $(lib_ossaudio) $(lib_ao) $(lib_shout) $(lib_sndio) $(lib_rsound) $(lib_portaudio) $(lib_pablio) $(lib_asound) $(lib_winmm) $(lib_pulse_simple) $(lib_jack) 
    2323CODEC_CELT= $(lib_celt) $(lib_celt0) 
    2424CODECLIBS = $(lib_vorbisfile) $(lib_vorbisenc) $(lib_vorbis) $(lib_fishsound) $(lib_speex) $(lib_speexdsp) $(CODEC_CELT) 
  • roard/driver.c

    r4148 r4490  
    9898 {"pulsesimple", "PulseAudio Simple", "server", DRV_FLAG_NONE, ROAR_SUBSYS_WAVEFORM, 
    9999  NULL, NULL, driver_pulsesimple_open}, 
     100#endif 
     101#ifdef ROAR_HAVE_LIBJACK 
     102 {"jack", "JACK", "???", DRV_FLAG_NONE, ROAR_SUBSYS_WAVEFORM, 
     103  NULL, NULL, driver_jack_open_vio}, 
    100104#endif 
    101105 {NULL, NULL, NULL, DRV_FLAG_NONE, 0, NULL, NULL, NULL} // end of list 
  • roard/include/driver.h

    r4141 r4490  
    132132#endif 
    133133 
     134#ifdef ROAR_HAVE_LIBJACK 
     135#include <jack/jack.h> 
     136#include <jack/transport.h> 
     137#include "driver_jack.h" 
     138#endif 
     139 
    134140#define DRV_FLAG_NONE           0x00 
    135141#define DRV_FLAG_FHSEC          0x01 
Note: See TracChangeset for help on using the changeset viewer.