diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-25 21:21:36 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-25 21:21:36 +0000 |
| commit | 2bae75fa0b3d10b844738e0cb5d03c5de23d0c49 (patch) | |
| tree | 9dc82419c0d076476904868f58ec3eeb9224dc6b /libs/ardour | |
| parent | 40d57d1c1ec4b5bf5f8ebb695d7ca4a15c7ba041 (diff) | |
MCP: dynamic ipMIDI ports, more default key bindings, various minor fixes
git-svn-id: svn://localhost/ardour2/branches/3.0@12092 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 2 | ||||
| -rw-r--r-- | libs/ardour/control_protocol_manager.cc | 12 | ||||
| -rw-r--r-- | libs/ardour/midi_ui.cc | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index cd093d1d80..1f9e3c1037 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -50,8 +50,6 @@ CONFIG_VARIABLE (bool, first_midi_bank_is_zero, "diplay-first-midi-bank-as-zero" CONFIG_VARIABLE (uint32_t, feedback_interval_ms, "feedback-interval-ms", 100) CONFIG_VARIABLE (bool, use_tranzport, "use-tranzport", false) -CONFIG_VARIABLE (std::string, mackie_device_name, "mackie-device-name", "Mackie Control Universal Pro") -CONFIG_VARIABLE (std::string, mackie_device_profile, "mackie-device-profile", "default") CONFIG_VARIABLE (RemoteModel, remote_model, "remote-model", MixerOrdered) /* disk operations */ diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index 876091fa7d..c72d3f31d0 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -75,8 +75,16 @@ ControlProtocolManager::set_session (Session* s) instantiate (**i); (*i)->requested = false; - if ((*i)->protocol && (*i)->state) { - (*i)->protocol->set_state (*(*i)->state, Stateful::loading_state_version); + if ((*i)->protocol) { + if ((*i)->state) { + (*i)->protocol->set_state (*(*i)->state, Stateful::loading_state_version); + } else { + /* guarantee a call to + set_state() whether we have + existing state or not + */ + (*i)->protocol->set_state (XMLNode(""), Stateful::loading_state_version); + } } } } diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc index e9e9eafb99..770a371457 100644 --- a/libs/ardour/midi_ui.cc +++ b/libs/ardour/midi_ui.cc @@ -134,8 +134,6 @@ MidiControlUI::reset_ports () for (MIDI::Manager::PortList::const_iterator i = plist->begin(); i != plist->end(); ++i) { - cerr << "MIDI UI looking at port " << (*i)->name() << endl; - if (!(*i)->centrally_parsed()) { continue; } |