ryujinx/libsoundio
1
0
Fork 0
mirror of https://github.com/Ryujinx/libsoundio.git synced 2025-01-03 14:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA input stream: add missing clean up

Browse source
This commit is contained in:
Andrew Kelley 2015-07-23 21:07:40 -07:00
parent 34039b4858
commit efa7b7cbc0
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
example/microphone.c
View file

@ -142,6 +142,11 @@ static void write_callback(struct SoundIoOutStream *outstream, int requested_fra
soundio_ring_buffer_advance_read_ptr(ring_buffer, total_read_count * outstream->bytes_per_frame); soundio_ring_buffer_advance_read_ptr(ring_buffer, total_read_count * outstream->bytes_per_frame);
} }
static void underflow_callback(struct SoundIoOutStream *outstream) {
static int count = 0;
fprintf(stderr, "underflow %d\n", count++);
}
static int usage(char *exe) { static int usage(char *exe) {
fprintf(stderr, "Usage: %s [--dummy] [--alsa] [--pulseaudio] [--in-device name] [--out-device name]\n", exe); fprintf(stderr, "Usage: %s [--dummy] [--alsa] [--pulseaudio] [--in-device name] [--out-device name]\n", exe);
return 1; return 1;
@ -280,14 +285,15 @@ int main(int argc, char **argv) {
outstream->format = *fmt; outstream->format = *fmt;
outstream->sample_rate = sample_rate; outstream->sample_rate = sample_rate;
outstream->layout = *layout; outstream->layout = *layout;
outstream->buffer_duration = 0.2; outstream->buffer_duration = 0.1;
outstream->period_duration = 0.1; outstream->period_duration = out_device->period_duration_min;
outstream->write_callback = write_callback; outstream->write_callback = write_callback;
outstream->underflow_callback = underflow_callback;
if ((err = soundio_outstream_open(outstream))) if ((err = soundio_outstream_open(outstream)))
panic("unable to open output stream: %s", soundio_strerror(err)); panic("unable to open output stream: %s", soundio_strerror(err));
int capacity = 0.4 * instream->sample_rate * instream->bytes_per_frame; int capacity = outstream->buffer_duration * 2 * instream->sample_rate * instream->bytes_per_frame;
ring_buffer = soundio_ring_buffer_create(soundio, capacity); ring_buffer = soundio_ring_buffer_create(soundio, capacity);
if (!ring_buffer) if (!ring_buffer)
panic("unable to create ring buffer: out of memory"); panic("unable to create ring buffer: out of memory");

12
src/alsa.cpp
View file

@ -1414,8 +1414,18 @@ static void instream_destroy_alsa(SoundIoPrivate *si, SoundIoInStreamPrivate *is
if (!isa) if (!isa)
return; return;
if (isa->thread) {
isa->thread_exit_flag.clear();
// TODO wake up poll
soundio_os_thread_destroy(isa->thread);
}
if (isa->handle)
snd_pcm_close(isa->handle);
deallocate(isa->poll_fds, isa->poll_fd_count);
deallocate(isa->chmap, isa->chmap_size); deallocate(isa->chmap, isa->chmap_size);
// TODO deallocate(isa->sample_buffer, isa->sample_buffer_size);
destroy(isa); destroy(isa);
is->backend_data = nullptr; is->backend_data = nullptr;