diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-13 19:50:39 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-13 19:50:39 +0000 |
| commit | 67601c6c50ac6506c1c6f87be1c726bd1fa4241b (patch) | |
| tree | 9b29e7718238fd0f6ebb992ece10a87d65b654a0 /gtk2_ardour | |
| parent | ff9ddf510065305e13d169d35f9b4e6b88ce76d7 (diff) | |
fix stupid MIDI::Manager design to properly handle multiple MIDI ports with the same "device" specification
git-svn-id: svn://localhost/ardour2/branches/3.0@6079 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/keyboard.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index 6094e3502e..200a666fea 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -197,7 +197,7 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) uint32_t keyval; bool ret = false; -#if 1 +#if 0 cerr << "snoop widget " << widget << " key " << event->keyval << " type: " << event->type << " state " << std::hex << event->state << std::dec << endl; diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 1ce53e80aa..507cd7ae41 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -170,36 +170,36 @@ private: void setup_ports_combo (ComboBoxText& c) { c.clear_items (); - MIDI::Manager::PortMap const & ports = MIDI::Manager::instance()->get_midi_ports (); - for (MIDI::Manager::PortMap::const_iterator i = ports.begin(); i != ports.end(); ++i) { - c.append_text (i->first); + MIDI::Manager::PortList const & ports = MIDI::Manager::instance()->get_midi_ports (); + for (MIDI::Manager::PortList::const_iterator i = ports.begin(); i != ports.end(); ++i) { + c.append_text ((*i)->name()); } } void ports_changed () { /* XXX: why is this coming from here? */ - MIDI::Manager::PortMap const & ports = MIDI::Manager::instance()->get_midi_ports (); + MIDI::Manager::PortList const & ports = MIDI::Manager::instance()->get_midi_ports (); _store->clear (); - for (MIDI::Manager::PortMap::const_iterator i = ports.begin(); i != ports.end(); ++i) { + for (MIDI::Manager::PortList::const_iterator i = ports.begin(); i != ports.end(); ++i) { TreeModel::Row r = *_store->append (); - r[_model.name] = i->first; + r[_model.name] = (*i)->name(); - if (i->second->input()) { - r[_model.online] = !i->second->input()->offline(); - i->second->input()->OfflineStatusChanged.connect (bind (mem_fun (*this, &MIDIPorts::port_offline_changed), i->second)); - r[_model.trace_input] = i->second->input()->tracing(); + if ((*i)->input()) { + r[_model.online] = !(*i)->input()->offline(); + (*i)->input()->OfflineStatusChanged.connect (bind (mem_fun (*this, &MIDIPorts::port_offline_changed), (*i))); + r[_model.trace_input] = (*i)->input()->tracing(); } - if (i->second->output()) { - r[_model.trace_output] = i->second->output()->tracing(); + if ((*i)->output()) { + r[_model.trace_output] = (*i)->output()->tracing(); } - r[_model.port] = i->second; + r[_model.port] = (*i); } setup_ports_combo (_mtc_combo); |