#include <gtkmm/alignment.h>
#include "pbd/error.h"
+#include "pbd/unwind.h"
#include "pbd/strsplit.h"
+#include "pbd/stacktrace.h"
#include "gtkmm2ext/actions.h"
+#include "gtkmm2ext/bindings.h"
#include "gtkmm2ext/gui_thread.h"
#include "gtkmm2ext/utils.h"
#include "surface.h"
#include "surface_port.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace Gtk;
, ipmidi_base_port_adjustment (_cp.ipmidi_base(), 0, 32767, 1, 1000)
, discover_button (_("Discover Mackie Devices"))
, _device_dependent_widget (0)
+ , ignore_active_change (false)
{
Gtk::Label* l;
Gtk::Alignment* align;
_surface_combo.signal_changed().connect (sigc::mem_fun (*this, &MackieControlProtocolGUI::surface_combo_changed));
_cp.DeviceChanged.connect (device_change_connection, invalidator (*this), boost::bind (&MackieControlProtocolGUI::device_changed, this), gui_context());
+ _cp.ConnectionChange.connect (connection_change_connection, invalidator (*this), boost::bind (&MackieControlProtocolGUI::connection_handler, this), gui_context());
ipmidi_base_port_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &MackieControlProtocolGUI::ipmidi_spinner_changed));
table.attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
touch_sensitivity_scale.property_digits() = 0;
touch_sensitivity_scale.property_draw_value() = false;
- table.attach (touch_sensitivity_scale, 1, 2, 5, 6, AttachOptions(FILL|EXPAND), AttachOptions (0));
+ table.attach (touch_sensitivity_scale, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
row++;
- table.attach (recalibrate_fader_button, row, row+1, 6, 7, AttachOptions(FILL|EXPAND), AttachOptions (0));
+ table.attach (recalibrate_fader_button, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
row++;
vector<string> profiles;
- profiles.push_back ("default");
-
for (std::map<std::string,DeviceProfile>::iterator i = DeviceProfile::device_profiles.begin(); i != DeviceProfile::device_profiles.end(); ++i) {
+ cerr << "add discovered profile " << i->first << endl;
profiles.push_back (i->first);
}
Gtkmm2ext::set_popdown_strings (_profile_combo, profiles);
+ cerr << "set active profile from " << p.device_profile().name() << endl;
_profile_combo.set_active_text (p.device_profile().name());
_profile_combo.signal_changed().connect (sigc::mem_fun (*this, &MackieControlProtocolGUI::profile_combo_changed));
}
void
-MackieControlProtocolGUI::update_port_combos (vector<string> const& midi_inputs, vector<string> const& midi_outputs,
- Gtk::ComboBoxText* input_combo,
- Gtk::ComboBoxText* output_combo,
- boost::shared_ptr<Surface> surface)
+MackieControlProtocolGUI::connection_handler ()
{
- vector<string> short_midi_inputs;
- vector<string> short_midi_outputs;
+ /* ignore all changes to combobox active strings here, because we're
+ updating them to match a new ("external") reality - we were called
+ because port connections have changed.
+ */
+
+ PBD::Unwinder<bool> ici (ignore_active_change, true);
+
+ vector<Gtk::ComboBox*>::iterator ic;
+ vector<Gtk::ComboBox*>::iterator oc;
- /* Prepend "Disconnected" */
+ vector<string> midi_inputs;
+ vector<string> midi_outputs;
- short_midi_inputs.push_back (_("Disconnected"));
- short_midi_outputs.push_back (_("Disconnected"));
+ ARDOUR::AudioEngine::instance()->get_ports ("", ARDOUR::DataType::MIDI, ARDOUR::PortFlags (ARDOUR::IsOutput|ARDOUR::IsTerminal), midi_inputs);
+ ARDOUR::AudioEngine::instance()->get_ports ("", ARDOUR::DataType::MIDI, ARDOUR::PortFlags (ARDOUR::IsInput|ARDOUR::IsTerminal), midi_outputs);
- /* generate short versions of all the port names */
+ for (ic = input_combos.begin(), oc = output_combos.begin(); ic != input_combos.end() && oc != output_combos.end(); ++ic, ++oc) {
- for (vector<string>::const_iterator s = midi_inputs.begin(); s != midi_inputs.end(); ++s) {
- short_midi_inputs.push_back ((*s).substr ((*s).find (':') + 1));
- }
- for (vector<string>::const_iterator s = midi_outputs.begin(); s != midi_outputs.end(); ++s) {
- short_midi_outputs.push_back ((*s).substr ((*s).find (':') + 1));
+ boost::shared_ptr<Surface> surface = _cp.get_surface_by_raw_pointer ((*ic)->get_data ("surface"));
+
+ if (surface) {
+ update_port_combos (midi_inputs, midi_outputs, *ic, *oc, surface);
+ }
}
+}
+void
+MackieControlProtocolGUI::update_port_combos (vector<string> const& midi_inputs, vector<string> const& midi_outputs,
+ Gtk::ComboBox* input_combo,
+ Gtk::ComboBox* output_combo,
+ boost::shared_ptr<Surface> surface)
+{
+ Glib::RefPtr<Gtk::ListStore> input = build_midi_port_list (midi_inputs, true);
+ Glib::RefPtr<Gtk::ListStore> output = build_midi_port_list (midi_outputs, false);
bool input_found = false;
- bool output_found = true;
+ bool output_found = false;
+ int n;
- Gtkmm2ext::set_popdown_strings (*input_combo, short_midi_inputs);
+ input_combo->set_model (input);
+ output_combo->set_model (output);
- vector<string>::iterator shrt = short_midi_inputs.begin();
- shrt++; /* skip "Disconnected" */
+ Gtk::TreeModel::Children children = input->children();
+ Gtk::TreeModel::Children::iterator i;
+ i = children.begin();
+ ++i; /* skip "Disconnected" */
- for (vector<string>::const_iterator s = midi_inputs.begin(); s != midi_inputs.end(); ++s, ++shrt) {
- if (surface->port().input().connected_to (*s)) {
- input_combo->set_active_text (*shrt);
+
+ for (n = 1; i != children.end(); ++i, ++n) {
+ string port_name = (*i)[midi_port_columns.full_name];
+ if (surface->port().input().connected_to (port_name)) {
+ input_combo->set_active (n);
input_found = true;
break;
}
}
if (!input_found) {
- input_combo->set_active_text (_("Disconnected"));
+ input_combo->set_active (0); /* disconnected */
}
- Gtkmm2ext::set_popdown_strings (*output_combo, short_midi_outputs);
-
- shrt = short_midi_outputs.begin();
- shrt++; /* skip "Disconnected" */
+ children = output->children();
+ i = children.begin();
+ ++i; /* skip "Disconnected" */
- for (vector<string>::const_iterator s = midi_outputs.begin(); s != midi_outputs.end(); ++s, ++shrt) {
- if (surface->port().output().connected_to (*s)) {
- output_combo->set_active_text (*shrt);
+ for (n = 1; i != children.end(); ++i, ++n) {
+ string port_name = (*i)[midi_port_columns.full_name];
+ if (surface->port().output().connected_to (port_name)) {
+ output_combo->set_active (n);
output_found = true;
break;
}
}
if (!output_found) {
- output_combo->set_active_text (_("Disconnected"));
+ output_combo->set_active (0); /* disconnected */
}
}
/*NOTREACHED*/
}
- Gtk::ComboBoxText* input_combo = manage (new Gtk::ComboBoxText);
- Gtk::ComboBoxText* output_combo = manage (new Gtk::ComboBoxText);
+ Gtk::ComboBox* input_combo = manage (new Gtk::ComboBox);
+ Gtk::ComboBox* output_combo = manage (new Gtk::ComboBox);
- input_combo->set_data ("surface", surface.get());
- output_combo->set_data ("surface", surface.get());
+ update_port_combos (midi_inputs, midi_outputs, input_combo, output_combo, surface);
+ input_combo->pack_start (midi_port_columns.short_name);
+ input_combo->set_data ("surface", surface.get());
input_combos.push_back (input_combo);
+ output_combo->pack_start (midi_port_columns.short_name);
+ output_combo->set_data ("surface", surface.get());
output_combos.push_back (output_combo);
- update_port_combos (midi_inputs, midi_outputs, input_combo, output_combo, surface);
+ boost::weak_ptr<Surface> ws (surface);
+ input_combo->signal_changed().connect (sigc::bind (sigc::mem_fun (*this, &MackieControlProtocolGUI::active_port_changed), input_combo, ws, true));
+ output_combo->signal_changed().connect (sigc::bind (sigc::mem_fun (*this, &MackieControlProtocolGUI::active_port_changed), output_combo, ws, false));
string send_string;
string receive_string;
vector<string> labels;
vector<string> tooltips;
vector<string> keys;
- vector<AccelKey> bindings;
+ vector<Glib::RefPtr<Gtk::Action> > actions;
+
typedef std::map<string,TreeIter> NodeMap;
NodeMap nodes;
NodeMap::iterator r;
- ActionManager::get_all_actions (labels, paths, tooltips, keys, bindings);
+ Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
vector<string>::iterator k;
vector<string>::iterator p;
available_action_model->clear ();
/* Because there are button bindings built in that are not
- in the key binding map, there needs to be a way to undo
- a profile edit. */
+ in the key binding map, there needs to be a way to undo
+ a profile edit.
+ */
TreeIter rowp;
TreeModel::Row parent;
rowp = available_action_model->append();
parent = *(rowp);
parent[available_action_columns.name] = _("CmdAlt");
-
for (l = labels.begin(), k = keys.begin(), p = paths.begin(), t = tooltips.begin(); l != labels.end(); ++k, ++p, ++t, ++l) {
TreeModel::Row row;
string action;
const string defstring = "\u2022";
- action = dp.get_button_action (bid, 0);
- if (action.empty()) {
- row[function_key_columns.plain] = defstring;
- } else {
- if (action.find ('/') == string::npos) {
- /* Probably a key alias */
- row[function_key_columns.plain] = action;
- } else {
+ /* We only allow plain bindings for Fn keys. All others are
+ * reserved for hard-coded actions.
+ */
- act = ActionManager::get_action (action.c_str());
- if (act) {
- row[function_key_columns.plain] = act->get_label();
+ if (bid >= Mackie::Button::F1 && bid <= Mackie::Button::F8) {
+
+ action = dp.get_button_action (bid, 0);
+ if (action.empty()) {
+ row[function_key_columns.plain] = defstring;
+ } else {
+ if (action.find ('/') == string::npos) {
+ /* Probably a key alias */
+ row[function_key_columns.plain] = action;
} else {
- row[function_key_columns.plain] = defstring;
+
+ act = ActionManager::get_action (action.c_str());
+ if (act) {
+ row[function_key_columns.plain] = act->get_label();
+ } else {
+ row[function_key_columns.plain] = defstring;
+ }
}
}
}
- action = dp.get_button_action (bid, MackieControlProtocol::MODIFIER_CONTROL);
- if (action.empty()) {
- row[function_key_columns.control] = defstring;
- } else {
- if (action.find ('/') == string::npos) {
- /* Probably a key alias */
- row[function_key_columns.control] = action;
+ /* We only allow plain bindings for Fn keys. All others are
+ * reserved for hard-coded actions.
+ */
+
+ if (bid >= Mackie::Button::F1 && bid <= Mackie::Button::F8) {
+
+ action = dp.get_button_action (bid, MackieControlProtocol::MODIFIER_SHIFT);
+ if (action.empty()) {
+ row[function_key_columns.shift] = defstring;
} else {
- act = ActionManager::get_action (action.c_str());
- if (act) {
- row[function_key_columns.control] = act->get_label();
+ if (action.find ('/') == string::npos) {
+ /* Probably a key alias */
+ row[function_key_columns.shift] = action;
} else {
- row[function_key_columns.control] = defstring;
+ act = ActionManager::get_action (action.c_str());
+ if (act) {
+ row[function_key_columns.shift] = act->get_label();
+ } else {
+ row[function_key_columns.shift] = defstring;
+ }
}
}
}
- action = dp.get_button_action (bid, MackieControlProtocol::MODIFIER_SHIFT);
+ action = dp.get_button_action (bid, MackieControlProtocol::MODIFIER_CONTROL);
if (action.empty()) {
- row[function_key_columns.shift] = defstring;
+ row[function_key_columns.control] = defstring;
} else {
if (action.find ('/') == string::npos) {
/* Probably a key alias */
- row[function_key_columns.shift] = action;
+ row[function_key_columns.control] = action;
} else {
act = ActionManager::get_action (action.c_str());
if (act) {
- row[function_key_columns.shift] = act->get_label();
+ row[function_key_columns.control] = act->get_label();
} else {
- row[function_key_columns.shift] = defstring;
+ row[function_key_columns.control] = defstring;
}
}
}
void
MackieControlProtocolGUI::surface_combo_changed ()
{
- _cp.not_session_load();
_cp.set_device (_surface_combo.get_active_text(), false);
}
_cp.set_touch_sensitivity (sensitivity);
}
-void
-MackieControlProtocolGUI::surface_connectivity_change (Surface* raw_surface)
+Glib::RefPtr<Gtk::ListStore>
+MackieControlProtocolGUI::build_midi_port_list (vector<string> const & ports, bool for_input)
{
- boost::shared_ptr<Surface> surface;
+ Glib::RefPtr<Gtk::ListStore> store = ListStore::create (midi_port_columns);
+ TreeModel::Row row;
- for (MackieControlProtocol::Surfaces::iterator s = _cp.surfaces.begin(); s != _cp.surfaces.end(); ++s) {
- if ((*s).get() == raw_surface) {
- surface = *s;
- break;
+ row = *store->append ();
+ row[midi_port_columns.full_name] = string();
+ row[midi_port_columns.short_name] = _("Disconnected");
+
+ for (vector<string>::const_iterator p = ports.begin(); p != ports.end(); ++p) {
+ row = *store->append ();
+ row[midi_port_columns.full_name] = *p;
+ std::string pn = ARDOUR::AudioEngine::instance()->get_pretty_name_by_name (*p);
+ if (pn.empty ()) {
+ pn = (*p).substr ((*p).find (':') + 1);
}
+ row[midi_port_columns.short_name] = pn;
}
- if (!surface) {
+ return store;
+}
+
+void
+MackieControlProtocolGUI::active_port_changed (Gtk::ComboBox* combo, boost::weak_ptr<Surface> ws, bool for_input)
+{
+ if (ignore_active_change) {
return;
}
- Gtk::ComboBoxText* input_combo = 0;
- Gtk::ComboBoxText* output_combo = 0;
+ boost::shared_ptr<Surface> surface = ws.lock();
- for (vector<Gtk::ComboBoxText*>::iterator c = input_combos.begin(); c != input_combos.end(); ++c) {
- if ((*c)->get_data ("surface") == raw_surface) {
- input_combo = *c;
- }
+ if (!surface) {
+ return;
}
- for (vector<Gtk::ComboBoxText*>::iterator c = output_combos.begin(); c != output_combos.end(); ++c) {
- if ((*c)->get_data ("surface") == raw_surface) {
- output_combo = *c;
+ TreeModel::iterator active = combo->get_active ();
+ string new_port = (*active)[midi_port_columns.full_name];
+
+ if (new_port.empty()) {
+ if (for_input) {
+ surface->port().input().disconnect_all ();
+ } else {
+ surface->port().output().disconnect_all ();
}
- }
- if (!input_combo || !output_combo) {
return;
}
- vector<string> midi_inputs;
- vector<string> midi_outputs;
-
- ARDOUR::AudioEngine::instance()->get_ports ("", ARDOUR::DataType::MIDI, ARDOUR::PortFlags (ARDOUR::IsOutput|ARDOUR::IsPhysical), midi_inputs);
- ARDOUR::AudioEngine::instance()->get_ports ("", ARDOUR::DataType::MIDI, ARDOUR::PortFlags (ARDOUR::IsInput|ARDOUR::IsPhysical), midi_outputs);
-
- update_port_combos (midi_inputs, midi_outputs, input_combo, output_combo, surface);
+ if (for_input) {
+ if (!surface->port().input().connected_to (new_port)) {
+ surface->port().input().disconnect_all ();
+ surface->port().input().connect (new_port);
+ }
+ } else {
+ if (!surface->port().output().connected_to (new_port)) {
+ surface->port().output().disconnect_all ();
+ surface->port().output().connect (new_port);
+ }
+ }
}
projects / ardour.git / blobdiff