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

output/jack: cache AudioFormat::channels

Browse Source
This commit is contained in:
Max Kellermann 2014-12-24 23:22:45 +01:00
parent 687fc358fd
commit 5a8d2e8057
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,16 +145,18 @@ JackOutput::Process(jack_nframes_t nframes)
jack_nframes_t available = GetAvailable(); jack_nframes_t available = GetAvailable();
const unsigned n_channels = audio_format.channels;
if (pause) { if (pause) {
/* empty the ring buffers */ /* empty the ring buffers */
for (unsigned i = 0; i < audio_format.channels; ++i) for (unsigned i = 0; i < n_channels; ++i)
jack_ringbuffer_read_advance(ringbuffer[i], jack_ringbuffer_read_advance(ringbuffer[i],
available * jack_sample_size); available * jack_sample_size);
/* generate silence while MPD is paused */ /* generate silence while MPD is paused */
for (unsigned i = 0; i < audio_format.channels; ++i) { for (unsigned i = 0; i < n_channels; ++i) {
jack_default_audio_sample_t *out = jack_default_audio_sample_t *out =
(jack_default_audio_sample_t *) (jack_default_audio_sample_t *)
jack_port_get_buffer(ports[i], nframes); jack_port_get_buffer(ports[i], nframes);
@ -168,7 +170,7 @@ JackOutput::Process(jack_nframes_t nframes)
if (available > nframes) if (available > nframes)
available = nframes; available = nframes;
for (unsigned i = 0; i < audio_format.channels; ++i) { for (unsigned i = 0; i < n_channels; ++i) {
jack_default_audio_sample_t *out = jack_default_audio_sample_t *out =
(jack_default_audio_sample_t *) (jack_default_audio_sample_t *)
jack_port_get_buffer(ports[i], nframes); jack_port_get_buffer(ports[i], nframes);
@ -188,7 +190,7 @@ JackOutput::Process(jack_nframes_t nframes)
/* generate silence for the unused source ports */ /* generate silence for the unused source ports */
for (unsigned i = audio_format.channels; i < num_source_ports; ++i) { for (unsigned i = n_channels; i < num_source_ports; ++i) {
jack_default_audio_sample_t *out = jack_default_audio_sample_t *out =
(jack_default_audio_sample_t *) (jack_default_audio_sample_t *)
jack_port_get_buffer(ports[i], nframes); jack_port_get_buffer(ports[i], nframes);