/** \file oggdec.c paraslash's ogg vorbis decoder */
-#include "gcc-compat.h"
#include "para.h"
#include "oggdec_filter.cmdline.h"
errno = EAGAIN;
return -1;
}
- ret = MIN(nmemb, have / size) * size;
+ ret = PARA_MIN(nmemb, have / size) * size;
memcpy(buf, p, ret);
pod->converted += ret;
return ret;
* Since we want the data source to be treated as unseekable at all
* times, the provided seek callback always returns -1 (failure).
*/
-static int cb_seek(__unused void *datasource, __unused ogg_int64_t offset,
- __unused int whence)
+static int cb_seek(__a_unused void *datasource, __a_unused ogg_int64_t offset,
+ __a_unused int whence)
{
return -1;
}
-static int cb_close(__unused void *datasource)
+static int cb_close(__a_unused void *datasource)
{
return 0;
}
{
struct private_oggdec_data *pod = para_calloc(
sizeof(struct private_oggdec_data));
- struct gengetopt_args_info *conf = fn->conf;
+ struct oggdec_filter_args_info *conf = fn->conf;
fn->private_data = pod;
fn->bufsize = conf->bufsize_arg * 1024;
{
ssize_t ret;
struct private_oggdec_data *pod = fn->private_data;
- struct gengetopt_args_info *conf = fn->conf;
+ struct oggdec_filter_args_info *conf = fn->conf;
/* make the buffer known to the read callback cb_read() */
pod->inbuf = inbuffer;
pod->inbuf_len = len;
if (!pod->vf) {
int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */
if (len <ib && !*fn->fci->eof && !fn->fci->error) {
- PARA_INFO_LOG("initial input buffer %d/%d, waiting for more data\n",
+ PARA_INFO_LOG("initial input buffer %zd/%d, waiting for more data\n",
len, ib);
return 0;
}
pod->vf = para_malloc(sizeof(struct OggVorbis_File));
- PARA_NOTICE_LOG("input buffer: %d, opening ov callbacks\n", len);
+ PARA_NOTICE_LOG("input buffer: %zd, opening ov callbacks\n", len);
ret = ov_open_callbacks(fn, pod->vf,
NULL, /* no initial buffer */
0, /* no initial bytes */
static void *oggdec_parse_config(int argc, char **argv)
{
- struct gengetopt_args_info *ret = para_calloc(sizeof(struct gengetopt_args_info));
+ struct oggdec_filter_args_info *ret = para_calloc(sizeof(struct oggdec_filter_args_info));
if (!oggdec_cmdline_parser(argc, argv, ret))
return ret;
free(ret);