From d22b71af47b44c1c1d84195743c34b589e6ab19c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 20 Feb 2010 00:47:45 +0100 Subject: src: reindent for 8ch indenting I am slowly moving all my projects to kernel-inspired 8ch indenting. This will break patches that haven't been merged yet, which I am aware of, but OTOH in times of git's --ignore-space-change shouldn't be too problematic. Yes, I am aware that reindenting like this sucks, but I cannot stand 4ch indenting anymore. Sorry. --- src/read-sound-file.c | 232 +++++++++++++++++++++++++------------------------- 1 file changed, 117 insertions(+), 115 deletions(-) (limited to 'src/read-sound-file.c') diff --git a/src/read-sound-file.c b/src/read-sound-file.c index ef20010..5544188 100644 --- a/src/read-sound-file.c +++ b/src/read-sound-file.c @@ -1,3 +1,5 @@ +/*-*- Mode: C; c-basic-offset: 8 -*-*/ + /*** This file is part of libcanberra. @@ -32,184 +34,184 @@ #include "canberra.h" struct ca_sound_file { - ca_wav *wav; - ca_vorbis *vorbis; - char *filename; + ca_wav *wav; + ca_vorbis *vorbis; + char *filename; - unsigned nchannels; - unsigned rate; - ca_sample_type_t type; + unsigned nchannels; + unsigned rate; + ca_sample_type_t type; }; int ca_sound_file_open(ca_sound_file **_f, const char *fn) { - FILE *file; - ca_sound_file *f; - int ret; - - ca_return_val_if_fail(_f, CA_ERROR_INVALID); - ca_return_val_if_fail(fn, CA_ERROR_INVALID); - - if (!(f = ca_new0(ca_sound_file, 1))) - return CA_ERROR_OOM; - - if (!(f->filename = ca_strdup(fn))) { - ret = CA_ERROR_OOM; - goto fail; - } - - if (!(file = fopen(fn, "r"))) { - ret = errno == ENOENT ? CA_ERROR_NOTFOUND : CA_ERROR_SYSTEM; - goto fail; - } - - if ((ret = ca_wav_open(&f->wav, file)) == CA_SUCCESS) { - f->nchannels = ca_wav_get_nchannels(f->wav); - f->rate = ca_wav_get_rate(f->wav); - f->type = ca_wav_get_sample_type(f->wav); - *_f = f; - return CA_SUCCESS; - } - - if (ret == CA_ERROR_CORRUPT) { - - if (fseek(file, 0, SEEK_SET) < 0) { - ret = CA_ERROR_SYSTEM; - goto fail; + FILE *file; + ca_sound_file *f; + int ret; + + ca_return_val_if_fail(_f, CA_ERROR_INVALID); + ca_return_val_if_fail(fn, CA_ERROR_INVALID); + + if (!(f = ca_new0(ca_sound_file, 1))) + return CA_ERROR_OOM; + + if (!(f->filename = ca_strdup(fn))) { + ret = CA_ERROR_OOM; + goto fail; + } + + if (!(file = fopen(fn, "r"))) { + ret = errno == ENOENT ? CA_ERROR_NOTFOUND : CA_ERROR_SYSTEM; + goto fail; } - if ((ret = ca_vorbis_open(&f->vorbis, file)) == CA_SUCCESS) { - f->nchannels = ca_vorbis_get_nchannels(f->vorbis); - f->rate = ca_vorbis_get_rate(f->vorbis); - f->type = CA_SAMPLE_S16NE; - *_f = f; - return CA_SUCCESS; + if ((ret = ca_wav_open(&f->wav, file)) == CA_SUCCESS) { + f->nchannels = ca_wav_get_nchannels(f->wav); + f->rate = ca_wav_get_rate(f->wav); + f->type = ca_wav_get_sample_type(f->wav); + *_f = f; + return CA_SUCCESS; + } + + if (ret == CA_ERROR_CORRUPT) { + + if (fseek(file, 0, SEEK_SET) < 0) { + ret = CA_ERROR_SYSTEM; + goto fail; + } + + if ((ret = ca_vorbis_open(&f->vorbis, file)) == CA_SUCCESS) { + f->nchannels = ca_vorbis_get_nchannels(f->vorbis); + f->rate = ca_vorbis_get_rate(f->vorbis); + f->type = CA_SAMPLE_S16NE; + *_f = f; + return CA_SUCCESS; + } } - } fail: - ca_free(f->filename); - ca_free(f); + ca_free(f->filename); + ca_free(f); - return ret; + return ret; } void ca_sound_file_close(ca_sound_file *f) { - ca_assert(f); + ca_assert(f); - if (f->wav) - ca_wav_close(f->wav); - if (f->vorbis) - ca_vorbis_close(f->vorbis); + if (f->wav) + ca_wav_close(f->wav); + if (f->vorbis) + ca_vorbis_close(f->vorbis); - ca_free(f->filename); - ca_free(f); + ca_free(f->filename); + ca_free(f); } unsigned ca_sound_file_get_nchannels(ca_sound_file *f) { - ca_assert(f); - return f->nchannels; + ca_assert(f); + return f->nchannels; } unsigned ca_sound_file_get_rate(ca_sound_file *f) { - ca_assert(f); - return f->rate; + ca_assert(f); + return f->rate; } ca_sample_type_t ca_sound_file_get_sample_type(ca_sound_file *f) { - ca_assert(f); - return f->type; + ca_assert(f); + return f->type; } const ca_channel_position_t* ca_sound_file_get_channel_map(ca_sound_file *f) { - ca_assert(f); + ca_assert(f); - if (f->wav) - return ca_wav_get_channel_map(f->wav); - else - return ca_vorbis_get_channel_map(f->vorbis); + if (f->wav) + return ca_wav_get_channel_map(f->wav); + else + return ca_vorbis_get_channel_map(f->vorbis); } int ca_sound_file_read_int16(ca_sound_file *f, int16_t *d, size_t *n) { - ca_return_val_if_fail(f, CA_ERROR_INVALID); - ca_return_val_if_fail(d, CA_ERROR_INVALID); - ca_return_val_if_fail(n, CA_ERROR_INVALID); - ca_return_val_if_fail(*n > 0, CA_ERROR_INVALID); - ca_return_val_if_fail(f->wav || f->vorbis, CA_ERROR_STATE); - ca_return_val_if_fail(f->type == CA_SAMPLE_S16NE || f->type == CA_SAMPLE_S16RE, CA_ERROR_STATE); - - if (f->wav) - return ca_wav_read_s16le(f->wav, d, n); - else - return ca_vorbis_read_s16ne(f->vorbis, d, n); + ca_return_val_if_fail(f, CA_ERROR_INVALID); + ca_return_val_if_fail(d, CA_ERROR_INVALID); + ca_return_val_if_fail(n, CA_ERROR_INVALID); + ca_return_val_if_fail(*n > 0, CA_ERROR_INVALID); + ca_return_val_if_fail(f->wav || f->vorbis, CA_ERROR_STATE); + ca_return_val_if_fail(f->type == CA_SAMPLE_S16NE || f->type == CA_SAMPLE_S16RE, CA_ERROR_STATE); + + if (f->wav) + return ca_wav_read_s16le(f->wav, d, n); + else + return ca_vorbis_read_s16ne(f->vorbis, d, n); } int ca_sound_file_read_uint8(ca_sound_file *f, uint8_t *d, size_t *n) { - ca_return_val_if_fail(f, CA_ERROR_INVALID); - ca_return_val_if_fail(d, CA_ERROR_INVALID); - ca_return_val_if_fail(n, CA_ERROR_INVALID); - ca_return_val_if_fail(*n > 0, CA_ERROR_INVALID); - ca_return_val_if_fail(f->wav && !f->vorbis, CA_ERROR_STATE); - ca_return_val_if_fail(f->type == CA_SAMPLE_U8, CA_ERROR_STATE); + ca_return_val_if_fail(f, CA_ERROR_INVALID); + ca_return_val_if_fail(d, CA_ERROR_INVALID); + ca_return_val_if_fail(n, CA_ERROR_INVALID); + ca_return_val_if_fail(*n > 0, CA_ERROR_INVALID); + ca_return_val_if_fail(f->wav && !f->vorbis, CA_ERROR_STATE); + ca_return_val_if_fail(f->type == CA_SAMPLE_U8, CA_ERROR_STATE); - if (f->wav) - return ca_wav_read_u8(f->wav, d, n); + if (f->wav) + return ca_wav_read_u8(f->wav, d, n); - return CA_ERROR_STATE; + return CA_ERROR_STATE; } int ca_sound_file_read_arbitrary(ca_sound_file *f, void *d, size_t *n) { - int ret; + int ret; - ca_return_val_if_fail(f, CA_ERROR_INVALID); - ca_return_val_if_fail(d, CA_ERROR_INVALID); - ca_return_val_if_fail(n, CA_ERROR_INVALID); - ca_return_val_if_fail(*n > 0, CA_ERROR_INVALID); + ca_return_val_if_fail(f, CA_ERROR_INVALID); + ca_return_val_if_fail(d, CA_ERROR_INVALID); + ca_return_val_if_fail(n, CA_ERROR_INVALID); + ca_return_val_if_fail(*n > 0, CA_ERROR_INVALID); - switch (f->type) { + switch (f->type) { case CA_SAMPLE_S16NE: case CA_SAMPLE_S16RE: { - size_t k; + size_t k; - k = *n / sizeof(int16_t); - if ((ret = ca_sound_file_read_int16(f, d, &k)) == CA_SUCCESS) - *n = k * sizeof(int16_t); + k = *n / sizeof(int16_t); + if ((ret = ca_sound_file_read_int16(f, d, &k)) == CA_SUCCESS) + *n = k * sizeof(int16_t); - break; + break; } case CA_SAMPLE_U8: { - size_t k; + size_t k; - k = *n; - if ((ret = ca_sound_file_read_uint8(f, d, &k)) == CA_SUCCESS) - *n = k; + k = *n; + if ((ret = ca_sound_file_read_uint8(f, d, &k)) == CA_SUCCESS) + *n = k; - break; + break; } default: - ca_assert_not_reached(); - } + ca_assert_not_reached(); + } - return ret; + return ret; } off_t ca_sound_file_get_size(ca_sound_file *f) { - ca_return_val_if_fail(f, (off_t) -1); + ca_return_val_if_fail(f, (off_t) -1); - if (f->wav) - return ca_wav_get_size(f->wav); - else - return ca_vorbis_get_size(f->vorbis); + if (f->wav) + return ca_wav_get_size(f->wav); + else + return ca_vorbis_get_size(f->vorbis); } size_t ca_sound_file_frame_size(ca_sound_file *f) { - unsigned c; + unsigned c; - ca_assert(f); + ca_assert(f); - c = ca_sound_file_get_nchannels(f); + c = ca_sound_file_get_nchannels(f); - return c * (ca_sound_file_get_sample_type(f) == CA_SAMPLE_U8 ? 1U : 2U); + return c * (ca_sound_file_get_sample_type(f) == CA_SAMPLE_U8 ? 1U : 2U); } -- cgit