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

jack: optimize local variables

Browse Source 
Merge the variables "avail_data" and "avail_frames" into "available".
Both variables are never used at the same time.
This commit is contained in:
Max Kellermann
2008-10-24 16:56:08 +02:00
parent 0a6704420b
commit e7cd237674
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/audioOutputs/audioOutput_jack.c
View File

@@ -125,25 +125,24 @@ static int process(jack_nframes_t nframes, void *arg)
{ {
JackData *jd = (JackData *) arg; JackData *jd = (JackData *) arg;
jack_default_audio_sample_t *out; jack_default_audio_sample_t *out;
size_t avail_data, avail_frames; size_t available;
if (nframes <= 0) if (nframes <= 0)
return 0; return 0;
for (unsigned i = 0; i < 2; ++i) { for (unsigned i = 0; i < 2; ++i) {
avail_data = jack_ringbuffer_read_space(jd->ringbuffer[i]); available = jack_ringbuffer_read_space(jd->ringbuffer[i]);
if (avail_data > nframes * sample_size) available /= sample_size;
avail_data = nframes * sample_size; if (available > nframes)
available = nframes;
avail_frames = avail_data / sample_size;
out = jack_port_get_buffer(jd->ports[i], nframes); out = jack_port_get_buffer(jd->ports[i], nframes);
jack_ringbuffer_read(jd->ringbuffer[i], jack_ringbuffer_read(jd->ringbuffer[i],
(char *)out, avail_data); (char *)out, available * sample_size);
while (avail_frames < nframes) while (available < nframes)
/* ringbuffer underrun, fill with silence */ /* ringbuffer underrun, fill with silence */
out[avail_frames++] = 0.0; out[available++] = 0.0;
} }
return 0; return 0;