provide support for playhead-to-next/previous-region-boundary actions, and bindings...

[ardour.git] / libs / ardour / configuration.cc

diff --git a/libs/ardour/configuration.cc b/libs/ardour/configuration.cc
index a0f2b5e036139ea7a1452c54d02b334e916b2768..c19541ddbd6950944df552affad1bcf649e50f9e 100644 (file)
--- a/libs/ardour/configuration.cc
+++ b/libs/ardour/configuration.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <unistd.h>
@@ -24,10 +23,11 @@
 #include <pbd/failed_constructor.h>
 #include <pbd/xml++.h>
 
+#include <midi++/manager.h>
+
 #include <ardour/ardour.h>
 #include <ardour/configuration.h>
 #include <ardour/audio_diskstream.h>
-#include <ardour/destructive_filesource.h>
 #include <ardour/control_protocol_manager.h>
 
 #include "i18n.h"
@@ -159,9 +159,12 @@ Configuration::get_state ()
        LocaleGuard lg (X_("POSIX"));
 
        root = new XMLNode("Ardour");
-       typedef map<string, MidiPortDescriptor*>::const_iterator CI;
-       for(CI m = midi_ports.begin(); m != midi_ports.end(); ++m){
-               root->add_child_nocopy(m->second->get_state());
+
+       MIDI::Manager::PortMap::const_iterator i;
+       const MIDI::Manager::PortMap& ports = MIDI::Manager::instance()->get_midi_ports();
+
+       for(i = ports.begin(); i != ports.end(); ++i) {
+               root->add_child_nocopy(i->second->get_state());
        }
        
        root->add_child_nocopy (get_variables (sigc::mem_fun (*this, &Configuration::save_config_options_predicate)));
@@ -214,10 +217,12 @@ Configuration::set_state (const XMLNode& root)
                if (node->name() == "MIDI-port") {
 
                        try {
-                               pair<string,MidiPortDescriptor*> newpair;
-                               newpair.second = new MidiPortDescriptor (*node);
-                               newpair.first = newpair.second->tag;
-                               midi_ports.insert (newpair);
+                               MIDI::Port::Descriptor desc (*node);
+                               map<string,XMLNode>::iterator x;
+                               if ((x = midi_ports.find (desc.tag)) != midi_ports.end()) {
+                                       midi_ports.erase (x);
+                               }
+                               midi_ports.insert (pair<string,XMLNode>(desc.tag,*node));
                        }
 
                        catch (failed_constructor& err) {
@@ -260,52 +265,6 @@ Configuration::set_variables (const XMLNode& node, ConfigVariableBase::Owner own
 
 }
 
-Configuration::MidiPortDescriptor::MidiPortDescriptor (const XMLNode& node)
-{
-       const XMLProperty *prop;
-       bool have_tag = false;
-       bool have_device = false;
-       bool have_type = false;
-       bool have_mode = false;
-
-       if ((prop = node.property ("tag")) != 0) {
-               tag = prop->value();
-               have_tag = true;
-       }
-
-       if ((prop = node.property ("device")) != 0) {
-               device = prop->value();
-               have_device = true;
-       }
-
-       if ((prop = node.property ("type")) != 0) {
-               type = prop->value();
-               have_type = true;
-       }
-
-       if ((prop = node.property ("mode")) != 0) {
-               mode = prop->value();
-               have_mode = true;
-       }
-
-       if (!have_tag || !have_device || !have_type || !have_mode) {
-               throw failed_constructor();
-       }
-}
-
-XMLNode&
-Configuration::MidiPortDescriptor::get_state()
-{
-       XMLNode* root = new XMLNode("MIDI-port");
-
-       root->add_property("tag", tag);
-       root->add_property("device", device);
-       root->add_property("type", type);
-       root->add_property("mode", mode);
-
-       return *root;
-}
-
 void
 Configuration::map_parameters (sigc::slot<void,const char*> theSlot)
 {
@@ -318,6 +277,22 @@ Configuration::map_parameters (sigc::slot<void,const char*> theSlot)
 #undef  CONFIG_VARIABLE_SPECIAL        
 }
 
+bool ConfigVariableBase::show_stores = false;
+
+void
+ConfigVariableBase::set_show_stored_values (bool yn)
+{
+       show_stores = yn;
+}
+
+void
+ConfigVariableBase::show_stored_value (const string& str)
+{
+       if (show_stores) {
+               cerr << "Config variable " << _name << " stored as " << str << endl;
+       }
+}
+
 void
 ConfigVariableBase::notify ()
 {
@@ -330,3 +305,4 @@ ConfigVariableBase::miss ()
        // placeholder for any debugging desired when a config variable 
        // is set but to the same value as it already has
 }
+