diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/AlsaDriver.cpp | 21 | ||||
| -rw-r--r-- | src/JackDriver.hpp | 20 | ||||
| -rw-r--r-- | src/Queue.hpp | 2 |
3 files changed, 25 insertions, 18 deletions
diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp index 55a95df..0ac2dc2 100644 --- a/src/AlsaDriver.cpp +++ b/src/AlsaDriver.cpp @@ -228,7 +228,7 @@ AlsaDriver::find_or_create_module(Patchage* patchage, void AlsaDriver::create_port_view_internal(Patchage* patchage, snd_seq_addr_t addr, - PatchageModule*& m, + PatchageModule*& parent, PatchagePort*& port) { if (ignore(addr)) { @@ -279,26 +279,27 @@ AlsaDriver::create_port_view_internal(Patchage* patchage, } if (!split) { - m = find_or_create_module( + parent = find_or_create_module( _app, addr.client, client_name, ModuleType::input_output); - if (!m->get_port(port_name)) { - port = create_port(*m, port_name, is_input, addr); + if (!parent->get_port(port_name)) { + port = create_port(*parent, port_name, is_input, addr); port->show(); } } else { // split ModuleType type = ((is_input) ? ModuleType::input : ModuleType::output); - m = find_or_create_module(_app, addr.client, client_name, type); - if (!m->get_port(port_name)) { - port = create_port(*m, port_name, is_input, addr); + parent = find_or_create_module(_app, addr.client, client_name, type); + if (!parent->get_port(port_name)) { + port = create_port(*parent, port_name, is_input, addr); port->show(); } if (is_duplex) { type = ((!is_input) ? ModuleType::input : ModuleType::output); - m = find_or_create_module(_app, addr.client, client_name, type); - if (!m->get_port(port_name)) { - port = create_port(*m, port_name, !is_input, addr); + parent = + find_or_create_module(_app, addr.client, client_name, type); + if (!parent->get_port(port_name)) { + port = create_port(*parent, port_name, !is_input, addr); port->show(); } } diff --git a/src/JackDriver.hpp b/src/JackDriver.hpp index 75f189c..16860f6 100644 --- a/src/JackDriver.hpp +++ b/src/JackDriver.hpp @@ -81,16 +81,22 @@ private: void shutdown(); - static void - jack_client_registration_cb(const char* name, int registered, void* me); - static void - jack_port_registration_cb(jack_port_id_t port_id, int registered, void* me); + static void jack_client_registration_cb(const char* name, + int registered, + void* jack_driver); + + static void jack_port_registration_cb(jack_port_id_t port_id, + int registered, + void* jack_driver); + static void jack_port_connect_cb(jack_port_id_t src, jack_port_id_t dst, int connect, - void* me); - static int jack_xrun_cb(void* me); - static void jack_shutdown_cb(void* me); + void* jack_driver); + + static int jack_xrun_cb(void* jack_driver); + + static void jack_shutdown_cb(void* jack_driver); Patchage* _app; jack_client_t* _client; diff --git a/src/Queue.hpp b/src/Queue.hpp index fbfc3b9..41f84bb 100644 --- a/src/Queue.hpp +++ b/src/Queue.hpp @@ -43,7 +43,7 @@ public: // Write thread: inline bool full() const; - inline bool push(const T& obj); + inline bool push(const T& elem); // Read thread: |