Changeset 5955:2ae1c52c3610 in roaraudio
- Timestamp:
- 11/20/13 16:43:30 (10 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 2 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
ChangeLog
r5953 r5955 5 5 * Code cleanup. 6 6 * Removed roarfish(1) (Closes: #339) 7 * Implemented read-only support for RAUM files using uniraum, 8 support using libRAUM got disabled (See #233). 7 9 8 10 v. 1.0beta10 - Tue Oct 15 2013 12:03 CEST -
configure
r5953 r5955 694 694 test_lib_defmake ROAR_HAVE_LIBAO % libao ao -- ao/ao.h ao/plugin.h 695 695 test_lib_defmake ROAR_HAVE_LIBRAUM % RAUM raum -- raum.h 696 test_lib_defmake ROAR_HAVE_LIBUNIRAUM % uniraum uniraum -- uniraum/uniraum.h 696 697 test_lib_defmake ROAR_HAVE_LIBOGG % libogg ogg -- ogg/ogg.h 697 698 test_lib_defmake ROAR_HAVE_LIBVORBIS % libvorbis vorbis -- vorbis/codec.h -
roard/Makefile
r5917 r5955 5 5 DRV=driver_esd.o driver_ao.o driver_roar.o driver_oss.o driver_shout.o driver_sndio.o driver_dmx.o driver_pwmled.o driver_i2cdmx.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 driver_artsc.o 6 6 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 codecfilter_flac.o codecfilter_roardmx.o 7 CF_CONTAINER=codecfilter_wave.o codecfilter_ raum.o codecfilter_au.o7 CF_CONTAINER=codecfilter_wave.o codecfilter_au.o codecfilter_uniraum.o 8 8 EMUL=emul_simple.o emul_rsound.o 9 9 HWMIXER=hwmixer_dstr.o hwmixer_oss.o … … 22 22 CODEC_CELT= $(lib_celt) $(lib_celt0) 23 23 CODECLIBS = $(lib_vorbisfile) $(lib_vorbisenc) $(lib_vorbis) $(lib_fishsound) $(lib_speex) $(lib_speexdsp) $(CODEC_CELT) $(lib_flac) 24 CONTLIBS = $(lib_oggz) $(lib_sndfile) $(lib_ogg) $(lib_ raum)24 CONTLIBS = $(lib_oggz) $(lib_sndfile) $(lib_ogg) $(lib_uniraum) 25 25 OWNLIBS = $(LIBROAREIO) $(LIBROARLIGHT) $(LIBROARMIDI) $(LIBROARDSP) $(LIBROAR) 26 26 LIBS = $(DRVLIBS) $(CODECLIBS) $(CONTLIBS) $(OWNLIBS) $(lib_slp) -
roard/codecfilter.c
r5823 r5955 83 83 #endif 84 84 85 #if 0 85 86 #ifdef ROAR_HAVE_LIBRAUM 86 87 {ROAR_CODEC_RAUM, "RAUM", "RAUM Container Format", NULL, cf_raum_setup, ROAR_CODECFILTER_WRITE, 87 88 ROAR_SUBSYS_WAVEFORM|ROAR_SUBSYS_MIDI|ROAR_SUBSYS_LIGHT|ROAR_SUBSYS_RAW|ROAR_SUBSYS_COMPLEX, 88 89 cont_fw_cf_open, cont_fw_cf_close, NULL, cont_fw_cf_write, cont_fw_cf_read, cont_fw_cf_flush, NULL, cont_fw_cf_ctl}, 90 #endif 91 #endif 92 #ifdef ROAR_HAVE_LIBUNIRAUM 93 {ROAR_CODEC_RAUM, "uniraum", "RAUM Container Format", NULL, NULL, ROAR_CODECFILTER_READ, 94 ROAR_SUBSYS_WAVEFORM|ROAR_SUBSYS_MIDI|ROAR_SUBSYS_LIGHT|ROAR_SUBSYS_RAW|ROAR_SUBSYS_COMPLEX, 95 cf_uniraum_open, cf_uniraum_close, NULL, cf_uniraum_write, cf_uniraum_read, cf_uniraum_flush, NULL, cf_uniraum_ctl}, 89 96 #endif 90 97 -
roard/include/codecfilter.h
r5823 r5955 114 114 #endif 115 115 116 #ifdef ROAR_HAVE_LIBUNIRAUM 117 #include "codecfilter_uniraum.h" 118 #endif 119 116 120 #include "container_framework.h" 117 121 -
roard/streams.c
r5823 r5955 566 566 ROAR_DBG("streams_set_role(id=%i, role=%i) = ?", id, role); 567 567 568 if ( old_role == role ) 568 if ( old_role == role ) { 569 ROAR_DBG("streams_set_role(id=%i, role=%i) = 0", id, role); 569 570 return 0; 571 } 570 572 571 573 if ( old_role != role && old_role != -1 && role != -1 ) { … … 813 815 break; 814 816 default: 817 ROAR_DBG("streams_set_fh(id=%i, fh=%i): codec=%s(%i)", id, fh, roar_codec2str(s->info.codec), s->info.codec); 815 818 if ( codecfilter_open(&(ss->codecfilter_inst), &(ss->codecfilter), NULL, 816 819 s->info.codec, ss) == -1 ) { 817 820 streams_delete(id); // TODO: FIXME: is this correct? shoudn't we return -1 in any case here? 821 ROAR_DBG("streams_set_fh(id=%i, fh=%i) = -1", id, fh); 818 822 return -1; 819 823 }
Note: See TracChangeset
for help on using the changeset viewer.