summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorKarl Linden <karl.j.linden@gmail.com>2017-07-05 20:48:39 +0200
committerKarl Lindén <karl.j.linden@gmail.com>2018-10-06 12:57:32 +0200
commitdde9f29a8ef94c72f83a1e4881158dc537d24fce (patch)
tree202fcf9478c089e419d61745fe668217a5f06e40 /linux
parentcf3f8205c4509966f04e6b77dad7c002db16d9d8 (diff)
downloadjack2-dde9f29a8ef94c72f83a1e4881158dc537d24fce.tar.gz
Fix unused{,-but-set}-variable compiler warnings.
Diffstat (limited to 'linux')
-rw-r--r--linux/alsa/alsa_driver.c27
-rw-r--r--linux/alsa/alsa_seqmidi.c3
-rw-r--r--linux/alsa/hdsp.c3
3 files changed, 14 insertions, 19 deletions
diff --git a/linux/alsa/alsa_driver.c b/linux/alsa/alsa_driver.c
index be4fa849..ba17079a 100644
--- a/linux/alsa/alsa_driver.c
+++ b/linux/alsa/alsa_driver.c
@@ -625,7 +625,6 @@ alsa_driver_set_parameters (alsa_driver_t *driver,
channel_t chn;
unsigned int pr = 0;
unsigned int cr = 0;
- int err;
driver->frame_rate = rate;
driver->frames_per_cycle = frames_per_cycle;
@@ -717,14 +716,14 @@ alsa_driver_set_parameters (alsa_driver_t *driver,
if (driver->playback_handle) {
snd_pcm_access_t access;
- err = snd_pcm_hw_params_get_period_size (
- driver->playback_hw_params, &p_period_size, &dir);
- err = snd_pcm_hw_params_get_format (
- driver->playback_hw_params,
- &(driver->playback_sample_format));
- err = snd_pcm_hw_params_get_access (driver->playback_hw_params,
+ snd_pcm_hw_params_get_period_size (
+ driver->playback_hw_params, &p_period_size, &dir);
+ snd_pcm_hw_params_get_format (
+ driver->playback_hw_params,
+ &(driver->playback_sample_format))
+ snd_pcm_hw_params_get_access (driver->playback_hw_params,
&access);
- driver->playback_interleaved =
+ driver->playback_interleaved =
(access == SND_PCM_ACCESS_MMAP_INTERLEAVED)
|| (access == SND_PCM_ACCESS_MMAP_COMPLEX);
@@ -740,14 +739,14 @@ alsa_driver_set_parameters (alsa_driver_t *driver,
if (driver->capture_handle) {
snd_pcm_access_t access;
- err = snd_pcm_hw_params_get_period_size (
- driver->capture_hw_params, &c_period_size, &dir);
- err = snd_pcm_hw_params_get_format (
- driver->capture_hw_params,
+ snd_pcm_hw_params_get_period_size (
+ driver->capture_hw_params, &c_period_size, &dir);
+ snd_pcm_hw_params_get_format (
+ driver->capture_hw_params,
&(driver->capture_sample_format));
- err = snd_pcm_hw_params_get_access (driver->capture_hw_params,
+ snd_pcm_hw_params_get_access (driver->capture_hw_params,
&access);
- driver->capture_interleaved =
+ driver->capture_interleaved =
(access == SND_PCM_ACCESS_MMAP_INTERLEAVED)
|| (access == SND_PCM_ACCESS_MMAP_COMPLEX);
diff --git a/linux/alsa/alsa_seqmidi.c b/linux/alsa/alsa_seqmidi.c
index f7583f39..49e7e765 100644
--- a/linux/alsa/alsa_seqmidi.c
+++ b/linux/alsa/alsa_seqmidi.c
@@ -856,7 +856,6 @@ void do_jack_output(alsa_seqmidi_t *self, port_t *port, struct process_info* inf
int64_t frame_offset;
int64_t out_time;
snd_seq_real_time_t out_rt;
- int err;
jack_midi_event_get(&jack_event, port->jack_buf, i);
@@ -896,7 +895,7 @@ void do_jack_output(alsa_seqmidi_t *self, port_t *port, struct process_info* inf
out_rt.tv_sec = out_time / NSEC_PER_SEC;
snd_seq_ev_schedule_real(&alsa_event, self->queue, 0, &out_rt);
- err = snd_seq_event_output(self->seq, &alsa_event);
+ snd_seq_event_output(self->seq, &alsa_event);
debug_log("alsa_out: written %d bytes to %s at %+d (%lld): %d", (int)jack_event.size, port->name, (int)frame_offset, out_time, err);
}
}
diff --git a/linux/alsa/hdsp.c b/linux/alsa/hdsp.c
index 64dcb407..606990e2 100644
--- a/linux/alsa/hdsp.c
+++ b/linux/alsa/hdsp.c
@@ -39,9 +39,6 @@ static const int hdsp_num_input_channels = 52;
static const int hdsp_physical_input_index[] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25};
-static const int hdsp_audio_stream_index[] = {
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51};
/*
* Use this array to choose the value of the output_channel