diff options
Diffstat (limited to 'oss.c')
| -rw-r--r-- | oss.c | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -27,7 +27,7 @@ struct oss_stream { sa_stream_t *parent; int fd; pcm_attrs_t real_pcm_attrs; - converter_t converter_read, converter_write; + sa_converter_t converter_read, converter_write; size_t read_fragment_size, write_fragment_size; unsigned read_nfragments, write_nfragments; sa_thread_t *thread; @@ -443,7 +443,7 @@ int driver_open(sa_stream_t *s) { printf("Chosen: %u channels, %uHz, format=%u\n", oss->real_pcm_attrs.nchannels, oss->real_pcm_attrs.rate, oss->real_pcm_attrs.format); - real_bps = oss->real_pcm_attrs.nchannels * oss->real_pcm_attrs.rate * get_pcm_sample_size(oss->real_pcm_attrs.format); + real_bps = oss->real_pcm_attrs.nchannels * oss->real_pcm_attrs.rate * sa_get_pcm_sample_size(oss->real_pcm_attrs.format); if (real_bps != bps && loops < 1) { loops++; @@ -526,11 +526,11 @@ int driver_open(sa_stream_t *s) { s->pcm_attrs.format = oss->real_pcm_attrs.format; if (s->mode & SA_MODE_RDONLY) - if ((r = converter_init(&oss->converter_read, &oss->real_pcm_attrs, &s->pcm_attrs, s->dynamic_rate_enabled)) < 0) + if ((r = sa_converter_init(&oss->converter_read, &oss->real_pcm_attrs, &s->pcm_attrs, s->dynamic_rate_enabled)) < 0) goto fail; if (s->mode & SA_MODE_WRONLY) - if ((r = converter_init(&oss->converter_write, &s->pcm_attrs, &oss->real_pcm_attrs, s->dynamic_rate_enabled)) < 0) + if ((r = sa_converter_init(&oss->converter_write, &s->pcm_attrs, &oss->real_pcm_attrs, s->dynamic_rate_enabled)) < 0) goto fail; } @@ -572,8 +572,8 @@ int driver_destroy(sa_stream_t *s) { close(oss->fd); sa_free(oss->real_pcm_attrs.channel_map); - converter_done(&oss->converter_read); - converter_done(&oss->converter_write); + sa_converter_done(&oss->converter_read); + sa_converter_done(&oss->converter_write); sa_free(oss); } @@ -670,7 +670,7 @@ int driver_change_read_volume(sa_stream_t *s, const int32_t vol[]) { sa_return_val_if_fail(!s->codec, SA_ERROR_NOT_SUPPORTED); - converter_set_volume(&oss->converter_read, vol); + sa_converter_set_volume(&oss->converter_read, vol); return SA_SUCCESS; } @@ -680,7 +680,7 @@ int driver_change_write_volume(sa_stream_t *s, const int32_t vol[]) { sa_return_val_if_fail(!s->codec, SA_ERROR_NOT_SUPPORTED); - converter_set_volume(&oss->converter_write, vol); + sa_converter_set_volume(&oss->converter_write, vol); return SA_SUCCESS; } @@ -689,9 +689,9 @@ int driver_change_rate(sa_stream_t *s, unsigned rate) { oss_stream_t *oss = OSS_STREAM(s); if (s->mode & SA_MODE_RDONLY) - converter_set_ratio(&oss->converter_read, oss->real_pcm_attrs.rate, s->pcm_attrs.rate); + sa_converter_set_ratio(&oss->converter_read, oss->real_pcm_attrs.rate, s->pcm_attrs.rate); if (s->mode & SA_MODE_WRONLY) - converter_set_ratio(&oss->converter_write, s->pcm_attrs.rate, oss->real_pcm_attrs.rate); + sa_converter_set_ratio(&oss->converter_write, s->pcm_attrs.rate, oss->real_pcm_attrs.rate); return SA_SUCCESS; } @@ -715,7 +715,7 @@ int driver_pwrite(sa_stream_t *s, const void *data, size_t nbytes, int64_t offse int ret; uint8_t *d; - if ((ret = converter_go_interleaved(&oss->converter_write, data, &dst, &stride, 1, &nbytes))) + if ((ret = sa_converter_go_interleaved(&oss->converter_write, data, &dst, &stride, 1, &nbytes))) return ret; d = dst[0]; |