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

output/jack: WriteSamples() returns size_t

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

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

@ -111,7 +111,11 @@ struct JackOutput {
void Process(jack_nframes_t nframes); void Process(jack_nframes_t nframes);
void WriteSamples(const void *src, size_t n_frames); /**
* @return the number of frames that were written
*/
size_t WriteSamples(const void *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);
}; };
@ -636,9 +640,11 @@ mpd_jack_delay(AudioOutput *ao)
: 0; : 0;
} }
inline void inline size_t
JackOutput::WriteSamples(const void *_src, size_t n_frames) JackOutput::WriteSamples(const void *_src, size_t n_frames)
{ {
const size_t result = n_frames;
const float *src = (const float *)_src; const float *src = (const float *)_src;
while (n_frames-- > 0) { while (n_frames-- > 0) {
@ -648,6 +654,8 @@ JackOutput::WriteSamples(const void *_src, size_t n_frames)
sizeof(*src)); sizeof(*src));
} }
} }
return result;
} }
inline size_t inline size_t
@ -689,8 +697,7 @@ JackOutput::Play(const void *chunk, size_t size, Error &error)
if (space < size) if (space < size)
size = space; size = space;
WriteSamples(chunk, size); return WriteSamples(chunk, size) * frame_size;
return size * frame_size;
} }
static size_t static size_t