ardour/livetrax
13
0
Fork 0
Code

Make use of ActionModel::build_custom_action_combo()

Browse Source
This commit is contained in:
Johannes Mueller 2019-04-20 22:36:51 +02:00
parent 822f55f4af
commit ce47ec411a
3 changed files with 5 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libs/surfaces/cc121/gui.cc
View File

@ -377,40 +377,8 @@ CC121GUI::action_changed (Gtk::ComboBox* cb, CC121::ButtonID id, CC121::ButtonSt
void
CC121GUI::build_action_combo (Gtk::ComboBox& cb, vector<pair<string,string> > const & actions, CC121::ButtonID id, CC121::ButtonState bs)
{
Glib::RefPtr<Gtk::ListStore> model (Gtk::ListStore::create (action_model.columns()));
TreeIter rowp;
TreeModel::Row row;
string current_action = fp.get_action (id, false, bs); /* lookup release action */
int active_row = -1;
int n;
vector<pair<string,string> >::const_iterator i;
rowp = model->append();
row = *(rowp);
row[action_model.name()] = _("Disabled");
row[action_model.path()] = string();
if (current_action.empty()) {
active_row = 0;
}
for (i = actions.begin(), n = 0; i != actions.end(); ++i, ++n) {
rowp = model->append();
row = *(rowp);
row[action_model.name()] = i->first;
row[action_model.path()] = i->second;
if (current_action == i->second) {
active_row = n+1;
}
}
cb.set_model (model);
cb.pack_start (action_model.name());
if (active_row >= 0) {
cb.set_active (active_row);
}
const string current_action = fp.get_action (id, false, bs); /* lookup release action */
action_model.build_custom_action_combo (cb, actions, current_action);
cb.signal_changed().connect (sigc::bind (sigc::mem_fun (*this, &CC121GUI::action_changed), &cb, id, bs));
}

36
libs/surfaces/faderport/gui.cc
View File

@ -358,40 +358,8 @@ FPGUI::action_changed (Gtk::ComboBox* cb, FaderPort::ButtonID id, FaderPort::But
void
FPGUI::build_action_combo (Gtk::ComboBox& cb, vector<pair<string,string> > const & actions, FaderPort::ButtonID id, FaderPort::ButtonState bs)
{
Glib::RefPtr<Gtk::ListStore> model (Gtk::ListStore::create (action_model.columns()));
TreeIter rowp;
TreeModel::Row row;
string current_action = fp.get_action (id, false, bs); /* lookup release action */
int active_row = -1;
int n;
vector<pair<string,string> >::const_iterator i;
rowp = model->append();
row = *(rowp);
row[action_model.name()] = _("Disabled");
row[action_model.path()] = string();
if (current_action.empty()) {
active_row = 0;
}
for (i = actions.begin(), n = 0; i != actions.end(); ++i, ++n) {
rowp = model->append();
row = *(rowp);
row[action_model.name()] = i->first;
row[action_model.path()] = i->second;
if (current_action == i->second) {
active_row = n+1;
}
}
cb.set_model (model);
cb.pack_start (action_model.name());
if (active_row >= 0) {
cb.set_active (active_row);
}
const string current_action = fp.get_action (id, false, bs); /* lookup release action */
action_model.build_custom_action_combo (cb, actions, current_action);
cb.signal_changed().connect (sigc::bind (sigc::mem_fun (*this, &FPGUI::action_changed), &cb, id, bs));
}

5
libs/surfaces/faderport8/gui.cc
View File

@ -339,14 +339,11 @@ FP8GUI::active_port_changed (Gtk::ComboBox* combo, bool for_input)
}
}
void
FP8GUI::build_action_combo (Gtk::ComboBox& cb, FP8Controls::ButtonId id)
{
/* set the active "row" to the right value for the current button binding */
string current_action = fp.get_button_action (id, false); /* lookup release action */
const string current_action = fp.get_button_action (id, false); /* lookup release action */
action_model.build_action_combo(cb, current_action);
cb.signal_changed().connect (sigc::bind (sigc::mem_fun (*this, &FP8GUI::action_changed), &cb, id));
}