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.

shout: pass void pointer to the encoder
b27d9e05 · Max Kellermann · 12756c1b · b27d9e05 · b27d9e05 · b27d9e05
Commit b27d9e05 authored Feb 10, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

shout_mp3.c src/output/shout_mp3.c +2 -2

shout_ogg.c src/output/shout_ogg.c +3 -2

shout_plugin.h src/output/shout_plugin.h +1 -1

No files found.
--- 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;

--- 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;

--- 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);