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

output/jack: pass float* to WriteSamples()

Browse Source
This commit is contained in:
Max Kellermann 2014-12-24 23:02:19 +01:00
parent cec2a837cf
commit b83a1d79b7
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/plugins/JackOutputPlugin.cxx
View File

@ -114,7 +114,7 @@ struct JackOutput {
/** /**
* @return the number of frames that were written * @return the number of frames that were written
*/ */
size_t WriteSamples(const void *src, size_t n_frames); size_t WriteSamples(const float *src, size_t n_frames);
size_t Play(const void *chunk, size_t size, Error &error); size_t Play(const void *chunk, size_t size, Error &error);
}; };
@ -641,12 +641,10 @@ mpd_jack_delay(AudioOutput *ao)
} }
inline size_t inline size_t
JackOutput::WriteSamples(const void *_src, size_t n_frames) JackOutput::WriteSamples(const float *src, size_t n_frames)
{ {
const size_t result = n_frames; const size_t result = n_frames;
const float *src = (const float *)_src;
while (n_frames-- > 0) { while (n_frames-- > 0) {
for (unsigned i = 0; i < audio_format.channels; ++i, ++src) { for (unsigned i = 0; i < audio_format.channels; ++i, ++src) {
jack_ringbuffer_write(ringbuffer[i], jack_ringbuffer_write(ringbuffer[i],
@ -697,7 +695,7 @@ JackOutput::Play(const void *chunk, size_t size, Error &error)
if (space < size) if (space < size)
size = space; size = space;
return WriteSamples(chunk, size) * frame_size; return WriteSamples((const float *)chunk, size) * frame_size;
} }
static size_t static size_t