* use S16NE for SF_FORMAT_PCM_S8 formats, too

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@899 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-05-17 14:54:41 +00:00
parent 31a9d4fb30
commit e6695538d7

View file

@ -317,24 +317,26 @@ int main(int argc, char *argv[]) {
sample_spec.rate = sfinfo.samplerate; sample_spec.rate = sfinfo.samplerate;
sample_spec.channels = sfinfo.channels; sample_spec.channels = sfinfo.channels;
readf_function = NULL;
switch (sfinfo.format & 0xFF) { switch (sfinfo.format & 0xFF) {
case SF_FORMAT_PCM_16: case SF_FORMAT_PCM_16:
case SF_FORMAT_PCM_U8: case SF_FORMAT_PCM_U8:
case SF_FORMAT_PCM_S8:
sample_spec.format = PA_SAMPLE_S16NE; sample_spec.format = PA_SAMPLE_S16NE;
readf_function = (sf_count_t (*)(SNDFILE *_sndfile, void *ptr, sf_count_t frames)) sf_readf_short; readf_function = (sf_count_t (*)(SNDFILE *_sndfile, void *ptr, sf_count_t frames)) sf_readf_short;
break; break;
case SF_FORMAT_ULAW: case SF_FORMAT_ULAW:
sample_spec.format = PA_SAMPLE_ULAW; sample_spec.format = PA_SAMPLE_ULAW;
readf_function = NULL;
break; break;
case SF_FORMAT_ALAW: case SF_FORMAT_ALAW:
sample_spec.format = PA_SAMPLE_ALAW; sample_spec.format = PA_SAMPLE_ALAW;
readf_function = NULL;
break; break;
case SF_FORMAT_FLOAT: case SF_FORMAT_FLOAT:
case SF_FORMAT_DOUBLE:
default: default:
sample_spec.format = PA_SAMPLE_FLOAT32NE; sample_spec.format = PA_SAMPLE_FLOAT32NE;
readf_function = (sf_count_t (*)(SNDFILE *_sndfile, void *ptr, sf_count_t frames)) sf_readf_float; readf_function = (sf_count_t (*)(SNDFILE *_sndfile, void *ptr, sf_count_t frames)) sf_readf_float;