diff options
| author | Max Kellermann <max@duempel.org> | 2009-02-10 21:28:25 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-02-10 21:28:25 +0100 |
| commit | b27d9e055bb51a4e5eff04c6e9237009d4578c7b (patch) | |
| tree | 024a37d08209a16d6bc618b96d31cb1f786139b1 | |
| parent | 12756c1b55dcf95364bb6ce5a476387e99067478 (diff) | |
| download | mpd-b27d9e055bb51a4e5eff04c6e9237009d4578c7b.tar.gz mpd-b27d9e055bb51a4e5eff04c6e9237009d4578c7b.tar.xz mpd-b27d9e055bb51a4e5eff04c6e9237009d4578c7b.zip | |
shout: pass void pointer to the encoder
Pass the music chunk as a "const void *" to the encoder, instead of a
"const char *". Actually, both encoders currently expect 16 bit
samples, passing a 8-bit character is rather pointless.
| -rw-r--r-- | src/output/shout_mp3.c | 4 | ||||
| -rw-r--r-- | src/output/shout_ogg.c | 5 | ||||
| -rw-r--r-- | src/output/shout_plugin.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/output/shout_mp3.c b/src/output/shout_mp3.c index 6086c843e..0e5d778f7 100644 --- a/src/output/shout_mp3.c +++ b/src/output/shout_mp3.c @@ -134,8 +134,8 @@ static int shout_mp3_encoder_send_metadata(struct shout_data *sd, return 1; } -static int shout_mp3_encoder_encode(struct shout_data *sd, - const char * chunk, size_t len) +static int +shout_mp3_encoder_encode(struct shout_data *sd, const void *chunk, size_t len) { const int16_t *src = (const int16_t*)chunk; unsigned int i; diff --git a/src/output/shout_ogg.c b/src/output/shout_ogg.c index b7c7b6706..8b769e8c0 100644 --- a/src/output/shout_ogg.c +++ b/src/output/shout_ogg.c @@ -247,8 +247,9 @@ pcm16_to_ogg_buffer(float **dest, const int16_t *src, dest[j][i] = *src++ / 32768.0; } -static int shout_ogg_encoder_encode(struct shout_data *sd, - const char *chunk, size_t size) +static int +shout_ogg_encoder_encode(struct shout_data *sd, + const void *chunk, size_t size) { struct shout_buffer *buf = &sd->buf; unsigned int samples; diff --git a/src/output/shout_plugin.h b/src/output/shout_plugin.h index 11ecf89fd..eb40907d3 100644 --- a/src/output/shout_plugin.h +++ b/src/output/shout_plugin.h @@ -36,7 +36,7 @@ struct shout_encoder_plugin { int (*clear_encoder_func)(struct shout_data *sd); int (*encode_func)(struct shout_data *sd, - const char *chunk, size_t len); + const void *chunk, size_t len); void (*finish_func)(struct shout_data *sd); int (*init_func)(struct shout_data *sd); int (*init_encoder_func) (struct shout_data *sd); |