This file is part of polypaudio.
polypaudio is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
+ it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with polypaudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
SNDFILE *sndfile;
struct pa_sink_input *sink_input;
struct pa_memchunk memchunk;
+ sf_count_t (*readf_function)(SNDFILE *sndfile, void *ptr, sf_count_t frames);
};
static void free_userdata(struct userdata *u) {
u->memchunk.memblock = pa_memblock_new(BUF_SIZE, i->sink->core->memblock_stat);
u->memchunk.index = 0;
- samples = sf_readf_float(u->sndfile, u->memchunk.memblock->data, samples);
+ samples = u->readf_function(u->sndfile, u->memchunk.memblock->data, samples);
u->memchunk.length = samples*fs;
if (!u->memchunk.length) {
goto fail;
}
- ss.format = PA_SAMPLE_FLOAT32;
+ switch (sfinfo.format & 0xFF) {
+ case SF_FORMAT_PCM_16:
+ case SF_FORMAT_PCM_U8:
+ case SF_FORMAT_ULAW:
+ case SF_FORMAT_ALAW:
+ ss.format = PA_SAMPLE_S16NE;
+ u->readf_function = (sf_count_t (*)(SNDFILE *sndfile, void *ptr, sf_count_t frames)) sf_readf_short;
+ break;
+ case SF_FORMAT_FLOAT:
+ default:
+ ss.format = PA_SAMPLE_FLOAT32NE;
+ u->readf_function = (sf_count_t (*)(SNDFILE *sndfile, void *ptr, sf_count_t frames)) sf_readf_float;
+ break;
+ }
+
ss.rate = sfinfo.samplerate;
ss.channels = sfinfo.channels;