1
mirror of https://github.com/mpv-player/mpv synced 2024-07-11 23:47:56 +02:00

Cosmetics for r29244 to follow K&R style closely.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29245 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
bircoph 2009-05-03 21:52:41 +00:00
parent e8abba5f43
commit fbf9a582f4

View File

@ -37,7 +37,7 @@ struct af_bs2b {
t_bs2bdp filter; ///< instance of a library filter t_bs2bdp filter; ///< instance of a library filter
}; };
#define PLAY(name,type) \ #define PLAY(name, type) \
static af_data_t *play_##name(struct af_instance_s *af, af_data_t *data) \ static af_data_t *play_##name(struct af_instance_s *af, af_data_t *data) \
{ \ { \
/* filter is called for all pairs of samples available in the buffer */ \ /* filter is called for all pairs of samples available in the buffer */ \
@ -47,23 +47,23 @@ static af_data_t *play_##name(struct af_instance_s *af, af_data_t *data) \
return data; \ return data; \
} }
PLAY(f,float) PLAY(f, float)
PLAY(fbe,float) PLAY(fbe, float)
PLAY(fle,float) PLAY(fle, float)
PLAY(s32be,int32_t) PLAY(s32be, int32_t)
PLAY(u32be, uint32_t) PLAY(u32be, uint32_t)
PLAY(s32le,int32_t) PLAY(s32le, int32_t)
PLAY(u32le, uint32_t) PLAY(u32le, uint32_t)
PLAY(s24be,bs2b_int24_t) PLAY(s24be, bs2b_int24_t)
PLAY(u24be, bs2b_uint24_t) PLAY(u24be, bs2b_uint24_t)
PLAY(s24le,bs2b_int24_t) PLAY(s24le, bs2b_int24_t)
PLAY(u24le, bs2b_uint24_t) PLAY(u24le, bs2b_uint24_t)
PLAY(s16be,int16_t) PLAY(s16be, int16_t)
PLAY(u16be, uint16_t) PLAY(u16be, uint16_t)
PLAY(s16le,int16_t) PLAY(s16le, int16_t)
PLAY(u16le, uint16_t) PLAY(u16le, uint16_t)
PLAY(s8,int8_t) PLAY(s8, int8_t)
PLAY(u8,uint8_t) PLAY(u8, uint8_t)
/// Sanity check for fcut value /// Sanity check for fcut value
static int test_fcut(void *par) static int test_fcut(void *par)
@ -163,7 +163,7 @@ static int control(struct af_instance_s *af, int cmd, void *arg)
default: default:
af->play = play_f; af->play = play_f;
af->data->format = AF_FORMAT_FLOAT_NE; af->data->format = AF_FORMAT_FLOAT_NE;
af->data->bps=4; af->data->bps = 4;
break; break;
} }
@ -176,7 +176,7 @@ static int control(struct af_instance_s *af, int cmd, void *arg)
af->data->rate, BS2B_MINSRATE, BS2B_MAXSRATE, BS2B_DEFAULT_SRATE); af->data->rate, BS2B_MINSRATE, BS2B_MAXSRATE, BS2B_DEFAULT_SRATE);
} }
bs2b_set_srate(s->filter, (long)af->data->rate); bs2b_set_srate(s->filter, (long)af->data->rate);
mp_msg(MSGT_AFILTER,MSGL_V, "[bs2b] using format %s\n", mp_msg(MSGT_AFILTER, MSGL_V, "[bs2b] using format %s\n",
af_fmt2str(af->data->format,buf,256)); af_fmt2str(af->data->format,buf,256));
return af_test_output(af,(af_data_t*)arg); return af_test_output(af,(af_data_t*)arg);
@ -189,7 +189,7 @@ static int control(struct af_instance_s *af, int cmd, void *arg)
{NULL} {NULL}
}; };
if (subopt_parse(arg, subopts) != 0) { if (subopt_parse(arg, subopts) != 0) {
mp_msg(MSGT_AFILTER,MSGL_ERR, "[bs2b] Invalid option specified.\n"); mp_msg(MSGT_AFILTER, MSGL_ERR, "[bs2b] Invalid option specified.\n");
free(s->profile); free(s->profile);
return AF_ERROR; return AF_ERROR;
} }
@ -243,9 +243,9 @@ static int af_open(af_instance_t *af)
af->control = control; af->control = control;
af->uninit = uninit; af->uninit = uninit;
af->mul = 1; af->mul = 1;
if (!(af->data = calloc(1,sizeof(af_data_t)))) if (!(af->data = calloc(1, sizeof(af_data_t))))
return AF_ERROR; return AF_ERROR;
if (!(af->setup = s = calloc(1,sizeof(struct af_bs2b)))) { if (!(af->setup = s = calloc(1, sizeof(struct af_bs2b)))) {
free(af->data); free(af->data);
return AF_ERROR; return AF_ERROR;
} }