diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/AlsaDriver.cpp | 19 | ||||
| -rw-r--r-- | src/JackDriver.cpp | 10 | ||||
| -rw-r--r-- | src/Patchage.cpp | 13 | ||||
| -rw-r--r-- | src/PatchageCanvas.cpp | 4 | ||||
| -rw-r--r-- | src/Queue.hpp | 10 |
5 files changed, 34 insertions, 22 deletions
diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp index 0ac2dc2..9f7b93b 100644 --- a/src/AlsaDriver.cpp +++ b/src/AlsaDriver.cpp @@ -200,7 +200,9 @@ AlsaDriver::find_module(uint8_t client_id, ModuleType type) ++j) { if (j->second->type() == type) { return j->second; - } else if (j->second->type() == ModuleType::input_output) { + } + + if (j->second->type() == ModuleType::input_output) { io_module = j->second; } } @@ -357,14 +359,17 @@ AlsaDriver::ignore(const snd_seq_addr_t& addr, bool add) if (caps & SND_SEQ_PORT_CAP_NO_EXPORT) { _ignored.insert(addr); return true; - } else if (!((caps & SND_SEQ_PORT_CAP_READ) || - (caps & SND_SEQ_PORT_CAP_WRITE) || - (caps & SND_SEQ_PORT_CAP_DUPLEX))) { + } + + if (!((caps & SND_SEQ_PORT_CAP_READ) || (caps & SND_SEQ_PORT_CAP_WRITE) || + (caps & SND_SEQ_PORT_CAP_DUPLEX))) { _ignored.insert(addr); return true; - } else if ((snd_seq_client_info_get_type(cinfo) != SND_SEQ_USER_CLIENT) && - ((type == SND_SEQ_PORT_SYSTEM_TIMER || - type == SND_SEQ_PORT_SYSTEM_ANNOUNCE))) { + } + + if ((snd_seq_client_info_get_type(cinfo) != SND_SEQ_USER_CLIENT) && + ((type == SND_SEQ_PORT_SYSTEM_TIMER || + type == SND_SEQ_PORT_SYSTEM_ANNOUNCE))) { _ignored.insert(addr); return true; } diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp index 105c5e0..47996e0 100644 --- a/src/JackDriver.cpp +++ b/src/JackDriver.cpp @@ -556,9 +556,9 @@ JackDriver::buffer_size() { if (_is_activated) { return _buffer_size; - } else { - return jack_get_buffer_size(_client); } + + return jack_get_buffer_size(_client); } void @@ -611,10 +611,10 @@ JackDriver::set_buffer_size(jack_nframes_t size) if (jack_set_buffer_size(_client, size)) { _app->error_msg("[JACK] Unable to set buffer size"); return false; - } else { - _buffer_size = size; - return true; } + + _buffer_size = size; + return true; } void diff --git a/src/Patchage.cpp b/src/Patchage.cpp index 678967a..d4b4a36 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -92,11 +92,16 @@ port_order(const GanvPort* a, const GanvPort* b, void* data) if (pa && pb) { if (pa->order() && pb->order()) { return *pa->order() - *pb->order(); - } else if (pa->order()) { + } + + if (pa->order()) { return -1; - } else if (pb->order()) { + } + + if (pb->order()) { return 1; } + return pa->name().compare(pb->name()); } return 0; @@ -489,10 +494,10 @@ Patchage::update_toolbar() static bool updating = false; if (updating) { return; - } else { - updating = true; } + updating = true; + #if defined(PATCHAGE_LIBJACK) || defined(HAVE_JACK_DBUS) if (_jack_driver->is_attached()) { const jack_nframes_t buffer_size = _jack_driver->buffer_size(); diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp index e081acb..7a75046 100644 --- a/src/PatchageCanvas.cpp +++ b/src/PatchageCanvas.cpp @@ -60,7 +60,9 @@ PatchageCanvas::find_module(const std::string& name, ModuleType type) ++j) { if (j->second->type() == type) { return j->second; - } else if (j->second->type() == ModuleType::input_output) { + } + + if (j->second->type() == ModuleType::input_output) { io_module = j->second; } } diff --git a/src/Queue.hpp b/src/Queue.hpp index 41f84bb..b951b56 100644 --- a/src/Queue.hpp +++ b/src/Queue.hpp @@ -112,12 +112,12 @@ Queue<T>::push(const T& elem) { if (full()) { return false; - } else { - unsigned back = _back.load(); - _objects[back] = elem; - _back = (back + 1) % _size; - return true; } + + const unsigned back = _back.load(); + _objects[back] = elem; + _back = (back + 1) % _size; + return true; } /** Pop an item off the front of the queue - realtime-safe, not thread-safe. |