oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

[CLEANUP] Remove unused function

Browse Source 
Cleanup whitespace->tabs

git-svn-id: https://svn.musicpd.org/mpd/trunk@4338 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Avuton Olrich 2006-07-14 20:08:35 +00:00
parent 2a4a75d9c7
commit a8938c91ba
2 changed files with 24 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/pcm_utils.c
View File

@ -26,21 +26,6 @@
#include <math.h> #include <math.h>
#include <assert.h> #include <assert.h>
void pcm_changeBufferEndianness(char * buffer, int bufferSize, int bits) {
char temp;
switch(bits) {
case 16:
while(bufferSize) {
temp = *buffer;
*buffer = *(buffer+1);
*(buffer+1) = temp;
bufferSize-=2;
}
break;
}
}
void pcm_volumeChange(char * buffer, int bufferSize, AudioFormat * format, void pcm_volumeChange(char * buffer, int bufferSize, AudioFormat * format,
int volume) int volume)
{ {
@ -85,7 +70,7 @@ void pcm_volumeChange(char * buffer, int bufferSize, AudioFormat * format,
} }
} }
void pcm_add(char * buffer1, char * buffer2, size_t bufferSize1, static void pcm_add(char * buffer1, char * buffer2, size_t bufferSize1,
size_t bufferSize2, int vol1, int vol2, AudioFormat * format) size_t bufferSize2, int vol1, int vol2, AudioFormat * format)
{ {
mpd_sint32 temp32; mpd_sint32 temp32;
@ -242,40 +227,40 @@ void pcm_convertAudioFormat(AudioFormat * inFormat, char * inBuffer, size_t
else { else {
/* only works if outFormat is 16-bit stereo! */ /* only works if outFormat is 16-bit stereo! */
/* resampling code blatantly ripped from ESD */ /* resampling code blatantly ripped from ESD */
mpd_uint32 rd_dat = 0; mpd_uint32 rd_dat = 0;
mpd_uint32 wr_dat = 0; mpd_uint32 wr_dat = 0;
mpd_sint16 lsample, rsample; mpd_sint16 lsample, rsample;
mpd_sint16 * out = (mpd_sint16 *)outBuffer; mpd_sint16 * out = (mpd_sint16 *)outBuffer;
mpd_sint16 * in = (mpd_sint16 *)dataChannelConv; mpd_sint16 * in = (mpd_sint16 *)dataChannelConv;
const int shift = sizeof(mpd_sint16)*outFormat->channels; const int shift = sizeof(mpd_sint16)*outFormat->channels;
mpd_uint32 nlen = ((( dataChannelLen / shift) * mpd_uint32 nlen = ((( dataChannelLen / shift) *
(mpd_uint32)(outFormat->sampleRate)) / (mpd_uint32)(outFormat->sampleRate)) /
inFormat->sampleRate); inFormat->sampleRate);
nlen *= outFormat->channels; nlen *= outFormat->channels;
switch(outFormat->channels) { switch(outFormat->channels) {
case 1: case 1:
while( wr_dat < nlen) { while( wr_dat < nlen) {
rd_dat = wr_dat * inFormat->sampleRate / rd_dat = wr_dat * inFormat->sampleRate /
outFormat->sampleRate; outFormat->sampleRate;
lsample = in[ rd_dat++ ]; lsample = in[ rd_dat++ ];
out[ wr_dat++ ] = lsample; out[ wr_dat++ ] = lsample;
} }
break; break;
case 2: case 2:
while( wr_dat < nlen) { while( wr_dat < nlen) {
rd_dat = wr_dat * inFormat->sampleRate / rd_dat = wr_dat * inFormat->sampleRate /
outFormat->sampleRate; outFormat->sampleRate;
rd_dat &= ~1; rd_dat &= ~1;
lsample = in[ rd_dat++ ]; lsample = in[ rd_dat++ ];
rsample = in[ rd_dat++ ]; rsample = in[ rd_dat++ ];
out[ wr_dat++ ] = lsample; out[ wr_dat++ ] = lsample;
out[ wr_dat++ ] = rsample; out[ wr_dat++ ] = rsample;
} }
break; break;
} }
} }

2
src/pcm_utils.h
View File

@ -25,8 +25,6 @@
#include <stdlib.h> #include <stdlib.h>
void pcm_changeBufferEndianness(char * buffer, int bufferSize, int bits);
void pcm_volumeChange(char * buffer, int bufferSize, AudioFormat * format, void pcm_volumeChange(char * buffer, int bufferSize, AudioFormat * format,
int volume); int volume);