diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-12 12:58:42 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-12 12:58:42 +0000 |
| commit | abf8069d7f04822533a9330a37a84126e130b572 (patch) | |
| tree | be0b5742d6f3f2d36b8fca8fb5d15aba8348d2cb /libs/surfaces/mackie/gui.cc | |
| parent | 3a4a45caaed11cd3a1ec722862c1f51084c79d63 (diff) | |
MCP: loading device info files basically operational
git-svn-id: svn://localhost/ardour2/branches/3.0@11939 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/mackie/gui.cc')
| -rw-r--r-- | libs/surfaces/mackie/gui.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libs/surfaces/mackie/gui.cc b/libs/surfaces/mackie/gui.cc index ea411122c4..7f49b3e392 100644 --- a/libs/surfaces/mackie/gui.cc +++ b/libs/surfaces/mackie/gui.cc @@ -22,10 +22,14 @@ #include <gtkmm/table.h> #include "gtkmm2ext/utils.h" #include "ardour/rc_configuration.h" + #include "mackie_control_protocol.h" +#include "device_info.h" + #include "i18n.h" using namespace std; +using namespace Mackie; class MackieControlProtocolGUI : public Gtk::VBox { @@ -73,9 +77,13 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p) table->attach (*manage (new Gtk::Label (_("Surface type:"))), 0, 1, 0, 1); table->attach (_surface_combo, 1, 2, 0, 1); - vector<string> surfaces = p.get_possible_devices (); + vector<string> surfaces; + + for (std::map<std::string,DeviceInfo>::iterator i = DeviceInfo::device_info.begin(); i != DeviceInfo::device_info.end(); ++i) { + surfaces.push_back (i->first); + } Gtkmm2ext::set_popdown_strings (_surface_combo, surfaces); - _surface_combo.set_active_text (p.device_name()); + _surface_combo.set_active_text (p.device_info().name()); _extenders.set_range (0, 8); _extenders.set_increments (1, 4); |