diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-09 20:05:18 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-09 20:05:18 +0000 |
| commit | 498dfebcca3b97cdd7b83444040042fe06626241 (patch) | |
| tree | 09b397ba40679e67a1a265e6d227e39ee0b4b4da /libs/ardour/rc_configuration.cc | |
| parent | 8f508460903ef628a3f34ee60611b75ed4e1a734 (diff) | |
90% done with external sync design changes (GUI now has toggle switch for ext/int sync; source chosen separately, currently in ardour prefs dialog ; fix libmidi++ and compilation scripts to correctly build JACK+ALSA support; minor contiuing tweaks on transport stuff
git-svn-id: svn://localhost/ardour2/branches/3.0@6048 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/rc_configuration.cc')
| -rw-r--r-- | libs/ardour/rc_configuration.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc index f04c148ab7..b34a6fd1ee 100644 --- a/libs/ardour/rc_configuration.cc +++ b/libs/ardour/rc_configuration.cc @@ -203,6 +203,8 @@ RCConfiguration::get_state () MIDI::Manager::PortMap::const_iterator i; const MIDI::Manager::PortMap& ports = MIDI::Manager::instance()->get_midi_ports(); + cerr << "Saving " << ports.size() << " MIDI ports\n"; + for (i = ports.begin(); i != ports.end(); ++i) { root->add_child_nocopy(i->second->get_state()); } @@ -260,8 +262,11 @@ RCConfiguration::set_state (const XMLNode& root, int /*version*/) MIDI::Port::Descriptor desc (*node); map<string,XMLNode>::iterator x; + if ((x = midi_ports.find (desc.tag)) != midi_ports.end()) { - midi_ports.erase (x); + warning << string_compose (_("Duplicate MIDI port definition found (tag=\"%1\") - ignored"), + desc.tag) << endmsg; + continue; } midi_ports.insert (pair<string,XMLNode>(desc.tag,*node)); } |