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

output/jack: merge two mpd_jack_available() calls

Browse Source
This commit is contained in:
Max Kellermann 2014-12-24 16:01:07 +01:00
parent 96560e317a
commit 39a5be2df9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,10 +116,11 @@ mpd_jack_process(jack_nframes_t nframes, void *arg)
if (nframes <= 0) if (nframes <= 0)
return 0; return 0;
jack_nframes_t available = mpd_jack_available(jd);
if (jd->pause) { if (jd->pause) {
/* empty the ring buffers */ /* empty the ring buffers */
const jack_nframes_t available = mpd_jack_available(jd);
for (unsigned i = 0; i < jd->audio_format.channels; ++i) for (unsigned i = 0; i < jd->audio_format.channels; ++i)
jack_ringbuffer_read_advance(jd->ringbuffer[i], jack_ringbuffer_read_advance(jd->ringbuffer[i],
available * jack_sample_size); available * jack_sample_size);
@ -138,7 +139,6 @@ mpd_jack_process(jack_nframes_t nframes, void *arg)
return 0; return 0;
} }
jack_nframes_t available = mpd_jack_available(jd);
if (available > nframes) if (available > nframes)
available = nframes; available = nframes;