mp3: use sizeof(sample) instead of hard-coded "2"

We are going to convert the code to 24 bit; don't hard-code a sample size of 2 bytes.

mp3: use sizeof(sample) instead of hard-coded "2"
bf5774ed · Max Kellermann · 0078837a · bf5774ed
Commit bf5774ed authored Oct 23, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

mp3_plugin.c src/inputPlugins/mp3_plugin.c +3 -2

No files found.
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -922,7 +922,8 @@ mp3Read(mp3DecodeData * data, ReplayGainInfo ** replayGainInfo)
 		}

 		max_samples = sizeof(data->outputBuffer) /
-			(2 * MAD_NCHANNELS(&(data->frame).header));
+			sizeof(data->outputBuffer[0]) /
+			MAD_NCHANNELS(&(data->frame).header);

 		while (i < pcm_length) {
 			enum decoder_command cmd;
@@ -940,7 +941,7 @@ mp3Read(mp3DecodeData * data, ReplayGainInfo ** replayGainInfo)
 			cmd = decoder_data(decoder, data->inStream,
 					   data->inStream->seekable,
 					   data->outputBuffer,
-					   2 * num_samples,
+					   sizeof(data->outputBuffer[0]) * num_samples,
 					   data->elapsedTime,
 					   data->bitRate / 1000,
 					   (replayGainInfo != NULL) ? *replayGainInfo : NULL);