diff options
author | falkTX <falktx@gmail.com> | 2018-11-13 23:01:23 +0100 |
---|---|---|
committer | falkTX <falktx@gmail.com> | 2018-11-13 23:01:23 +0100 |
commit | 7dfdbe133ad8663222f3a980b286b76366d4b81d (patch) | |
tree | c2429d5dd72ba5d6acb040df05c6da4ccf59443b /linux | |
parent | 294115922e8a35421d0bb5d79b7e1e8589f29e1b (diff) | |
download | jack2-7dfdbe133ad8663222f3a980b286b76366d4b81d.tar.gz |
Cleanup some warnings
Signed-off-by: falkTX <falktx@gmail.com>
Diffstat (limited to 'linux')
-rw-r--r-- | linux/alsa/alsa_driver.c | 3 | ||||
-rw-r--r-- | linux/alsa/alsa_rawmidi.c | 2 | ||||
-rw-r--r-- | linux/alsa/alsa_seqmidi.c | 7 | ||||
-rw-r--r-- | linux/alsa/hdsp.c | 2 | ||||
-rw-r--r-- | linux/alsarawmidi/JackALSARawMidiInputPort.cpp | 6 | ||||
-rw-r--r-- | linux/alsarawmidi/JackALSARawMidiOutputPort.cpp | 6 | ||||
-rw-r--r-- | linux/firewire/JackFFADOMidiInputPort.cpp | 4 | ||||
-rw-r--r-- | linux/firewire/JackFFADOMidiOutputPort.cpp | 4 |
8 files changed, 21 insertions, 13 deletions
diff --git a/linux/alsa/alsa_driver.c b/linux/alsa/alsa_driver.c index 5fee8f7f..39be0624 100644 --- a/linux/alsa/alsa_driver.c +++ b/linux/alsa/alsa_driver.c @@ -912,6 +912,9 @@ alsa_driver_set_parameters (alsa_driver_t *driver, */ return 0; + + // may be unused + (void)err; } int diff --git a/linux/alsa/alsa_rawmidi.c b/linux/alsa/alsa_rawmidi.c index 5faf7996..08c1f89e 100644 --- a/linux/alsa/alsa_rawmidi.c +++ b/linux/alsa/alsa_rawmidi.c @@ -467,7 +467,7 @@ int midi_port_open(alsa_rawmidi_t *midi, midi_port_t *port) if (midi_port_open_jack(midi, port, type, name)) { int num; num = port->id.id[3] ? port->id.id[3] : port->id.id[1]; - snprintf(name, sizeof(name), "%s %d", port->name, num); + snprintf(name, 20, "%s %d", port->name, num); if (midi_port_open_jack(midi, port, type, name)) return 2; } diff --git a/linux/alsa/alsa_seqmidi.c b/linux/alsa/alsa_seqmidi.c index f7583f39..96c18566 100644 --- a/linux/alsa/alsa_seqmidi.c +++ b/linux/alsa/alsa_seqmidi.c @@ -849,14 +849,13 @@ void do_jack_output(alsa_seqmidi_t *self, port_t *port, struct process_info* inf { stream_t *str = &self->stream[info->dir]; int nevents = jack_midi_get_event_count(port->jack_buf); - int i; + int i, err; for (i=0; i<nevents; ++i) { jack_midi_event_t jack_event; snd_seq_event_t alsa_event; 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); @@ -899,6 +898,10 @@ void do_jack_output(alsa_seqmidi_t *self, port_t *port, struct process_info* inf err = 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); } + return; + + // may be unused + (void)err; } static diff --git a/linux/alsa/hdsp.c b/linux/alsa/hdsp.c index 64dcb407..b399e17f 100644 --- a/linux/alsa/hdsp.c +++ b/linux/alsa/hdsp.c @@ -39,9 +39,11 @@ 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}; +#ifdef CANNOT_HEAR_SOFTWARE_STREAM_WHEN_MONITORING 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}; +#endif /* * Use this array to choose the value of the output_channel diff --git a/linux/alsarawmidi/JackALSARawMidiInputPort.cpp b/linux/alsarawmidi/JackALSARawMidiInputPort.cpp index 441c9186..f2fdb885 100644 --- a/linux/alsarawmidi/JackALSARawMidiInputPort.cpp +++ b/linux/alsarawmidi/JackALSARawMidiInputPort.cpp @@ -35,11 +35,11 @@ JackALSARawMidiInputPort::JackALSARawMidiInputPort(snd_rawmidi_info_t *info, alsa_event = 0; jack_event = 0; receive_queue = new JackALSARawMidiReceiveQueue(rawmidi, max_bytes); - std::auto_ptr<JackALSARawMidiReceiveQueue> receive_ptr(receive_queue); + std::unique_ptr<JackALSARawMidiReceiveQueue> receive_ptr(receive_queue); thread_queue = new JackMidiAsyncQueue(max_bytes, max_messages); - std::auto_ptr<JackMidiAsyncQueue> thread_ptr(thread_queue); + std::unique_ptr<JackMidiAsyncQueue> thread_ptr(thread_queue); write_queue = new JackMidiBufferWriteQueue(); - std::auto_ptr<JackMidiBufferWriteQueue> write_ptr(write_queue); + std::unique_ptr<JackMidiBufferWriteQueue> write_ptr(write_queue); raw_queue = new JackMidiRawInputWriteQueue(thread_queue, max_bytes, max_messages); write_ptr.release(); diff --git a/linux/alsarawmidi/JackALSARawMidiOutputPort.cpp b/linux/alsarawmidi/JackALSARawMidiOutputPort.cpp index 7d48a505..3d154ebe 100644 --- a/linux/alsarawmidi/JackALSARawMidiOutputPort.cpp +++ b/linux/alsarawmidi/JackALSARawMidiOutputPort.cpp @@ -34,11 +34,11 @@ JackALSARawMidiOutputPort::JackALSARawMidiOutputPort(snd_rawmidi_info_t *info, { alsa_event = 0; read_queue = new JackMidiBufferReadQueue(); - std::auto_ptr<JackMidiBufferReadQueue> read_ptr(read_queue); + std::unique_ptr<JackMidiBufferReadQueue> read_ptr(read_queue); send_queue = new JackALSARawMidiSendQueue(rawmidi, max_bytes_per_poll); - std::auto_ptr<JackALSARawMidiSendQueue> send_ptr(send_queue); + std::unique_ptr<JackALSARawMidiSendQueue> send_ptr(send_queue); thread_queue = new JackMidiAsyncQueue(max_bytes, max_messages); - std::auto_ptr<JackMidiAsyncQueue> thread_ptr(thread_queue); + std::unique_ptr<JackMidiAsyncQueue> thread_ptr(thread_queue); raw_queue = new JackMidiRawOutputWriteQueue(send_queue, max_bytes, max_messages, max_messages); thread_ptr.release(); diff --git a/linux/firewire/JackFFADOMidiInputPort.cpp b/linux/firewire/JackFFADOMidiInputPort.cpp index 080b269b..40a1ee14 100644 --- a/linux/firewire/JackFFADOMidiInputPort.cpp +++ b/linux/firewire/JackFFADOMidiInputPort.cpp @@ -29,9 +29,9 @@ JackFFADOMidiInputPort::JackFFADOMidiInputPort(size_t max_bytes) { event = 0; receive_queue = new JackFFADOMidiReceiveQueue(); - std::auto_ptr<JackFFADOMidiReceiveQueue> receive_queue_ptr(receive_queue); + std::unique_ptr<JackFFADOMidiReceiveQueue> receive_queue_ptr(receive_queue); write_queue = new JackMidiBufferWriteQueue(); - std::auto_ptr<JackMidiBufferWriteQueue> write_queue_ptr(write_queue); + std::unique_ptr<JackMidiBufferWriteQueue> write_queue_ptr(write_queue); raw_queue = new JackMidiRawInputWriteQueue(write_queue, max_bytes, max_bytes); write_queue_ptr.release(); diff --git a/linux/firewire/JackFFADOMidiOutputPort.cpp b/linux/firewire/JackFFADOMidiOutputPort.cpp index d4a0899d..112fd745 100644 --- a/linux/firewire/JackFFADOMidiOutputPort.cpp +++ b/linux/firewire/JackFFADOMidiOutputPort.cpp @@ -31,9 +31,9 @@ JackFFADOMidiOutputPort::JackFFADOMidiOutputPort(size_t non_rt_size, { event = 0; read_queue = new JackMidiBufferReadQueue(); - std::auto_ptr<JackMidiBufferReadQueue> read_queue_ptr(read_queue); + std::unique_ptr<JackMidiBufferReadQueue> read_queue_ptr(read_queue); send_queue = new JackFFADOMidiSendQueue(); - std::auto_ptr<JackFFADOMidiSendQueue> send_queue_ptr(send_queue); + std::unique_ptr<JackFFADOMidiSendQueue> send_queue_ptr(send_queue); raw_queue = new JackMidiRawOutputWriteQueue(send_queue, non_rt_size, max_non_rt_messages, max_rt_messages); |