smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix a potential endless recursion from c2b25b453e

Browse source 
ArdourDropdown::set_active() -> StateChanged -> .. -> set_active()
This commit is contained in:
Robin Gareus 2020-04-22 16:20:54 +02:00
parent 9a93583ef7
commit fcfaa0ac49
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gtk2_ardour/virtual_keyboard_window.cc
View file

@ -151,7 +151,6 @@ VirtualKeyboardWindow::VirtualKeyboardWindow ()
sprintf (key, "%d", c); sprintf (key, "%d", c);
_cc_key[i].append_text_item (key); _cc_key[i].append_text_item (key);
} }
update_cc (i, default_cc[i]);
tbl->attach (*_cc_knob[i], col, col + 1, 0, 1, SHRINK, SHRINK, 4, 2); tbl->attach (*_cc_knob[i], col, col + 1, 0, 1, SHRINK, SHRINK, 4, 2);
tbl->attach (_cc_key[i], col, col + 1, 1, 2, SHRINK, SHRINK, 4, 2); tbl->attach (_cc_key[i], col, col + 1, 1, 2, SHRINK, SHRINK, 4, 2);
@ -159,6 +158,8 @@ VirtualKeyboardWindow::VirtualKeyboardWindow ()
_cc_key[i].StateChanged.connect (sigc::bind (sigc::mem_fun (*this, &VirtualKeyboardWindow::cc_key_changed), i)); _cc_key[i].StateChanged.connect (sigc::bind (sigc::mem_fun (*this, &VirtualKeyboardWindow::cc_key_changed), i));
_cc[i]->ValueChanged.connect_same_thread (_cc_connections, _cc[i]->ValueChanged.connect_same_thread (_cc_connections,
boost::bind (&VirtualKeyboardWindow::control_change_knob_event_handler, this, i, _1)); boost::bind (&VirtualKeyboardWindow::control_change_knob_event_handler, this, i, _1));
update_cc (i, default_cc[i]);
} }
tbl->attach (*manage (new ArdourVSpacer), col, col + 1, 0, 2, SHRINK, FILL, 4, 0); tbl->attach (*manage (new ArdourVSpacer), col, col + 1, 0, 2, SHRINK, FILL, 4, 0);
@ -431,8 +432,8 @@ VirtualKeyboardWindow::update_velocity_settings ()
void void
VirtualKeyboardWindow::cc_key_changed (size_t i) VirtualKeyboardWindow::cc_key_changed (size_t i)
{ {
int ctrl = PBD::atoi (_cc_key[i].get_text ()); _cc_knob[i]->set_tooltip_prefix (string_compose (_("CC-%1: "), _cc_key[i].get_text ()));
update_cc (i, ctrl); // TODO update _cc[i]->normal
} }
void void
@ -445,8 +446,6 @@ VirtualKeyboardWindow::update_cc (size_t i, int cc)
char buf[16]; char buf[16];
sprintf (buf, "%d", cc); sprintf (buf, "%d", cc);
_cc_key[i].set_active (buf); _cc_key[i].set_active (buf);
_cc_knob[i]->set_tooltip_prefix (string_compose (_("CC-%1: "), cc));
// TODO update _cc[i]->normal
} }
void void