reset midi synth (panic) when seeking or re-starting audition

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

diff --git a/libs/ardour/configuration.cc b/libs/ardour/configuration.cc
index 79f36c86d8a570f1ff00ccee5b929bc88cef2de6..d5ca426a74d3c8cf9d3493f0c4e6f3bcdc3481c3 100644 (file)
--- a/libs/ardour/configuration.cc
+++ b/libs/ardour/configuration.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1999-2009 Paul Davis 
+    Copyright (C) 1999-2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,12 @@
 
 */
 
+#include <iostream>
+
+#include "pbd/compose.h"
+
 #include "ardour/configuration.h"
+#include "ardour/debug.h"
 
 using namespace ARDOUR;
 using namespace std;
@@ -31,13 +36,11 @@ Configuration::~Configuration ()
 {
 }
 
-bool ConfigVariableBase::show_stores = false;
-
 void
 ConfigVariableBase::add_to_node (XMLNode& node)
 {
-       std::string const v = get_as_string ();
-       show_stored_value (v);
+       const std::string v = get_as_string ();
+       DEBUG_TRACE (DEBUG::Configuration, string_compose ("Config variable %1 stored as [%2]\n", _name, v));
        XMLNode* child = new XMLNode ("Option");
        child->add_property ("name", _name);
        child->add_property ("value", v);
@@ -48,20 +51,20 @@ bool
 ConfigVariableBase::set_from_node (XMLNode const & node)
 {
        if (node.name() == "Config" || node.name() == "Canvas" || node.name() == "UI") {
-               
+
                /* ardour.rc */
-               
+
                const XMLProperty* prop;
                XMLNodeList nlist;
                XMLNodeConstIterator niter;
                XMLNode* child;
-               
+
                nlist = node.children();
-               
+
                for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-                       
+
                        child = *niter;
-                       
+
                        if (child->name() == "Option") {
                                if ((prop = child->property ("name")) != 0) {
                                        if (prop->value() == _name) {
@@ -73,7 +76,7 @@ ConfigVariableBase::set_from_node (XMLNode const & node)
                                }
                        }
                }
-                       
+
        } else if (node.name() == "Options") {
 
                /* session file */
@@ -82,13 +85,13 @@ ConfigVariableBase::set_from_node (XMLNode const & node)
                XMLNodeConstIterator oiter;
                XMLNode* option;
                const XMLProperty* opt_prop;
-               
+
                olist = node.children();
-               
+
                for (oiter = olist.begin(); oiter != olist.end(); ++oiter) {
-                       
+
                        option = *oiter;
-                       
+
                        if (option->name() == _name) {
                                if ((opt_prop = option->property ("val")) != 0) {
                                        set_from_string (opt_prop->value());
@@ -97,23 +100,8 @@ ConfigVariableBase::set_from_node (XMLNode const & node)
                        }
                }
        }
-       
-       return 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;
-       }
+       return false;
 }
 
 void
@@ -125,7 +113,7 @@ ConfigVariableBase::notify ()
 void
 ConfigVariableBase::miss ()
 {
-       // placeholder for any debugging desired when a config variable 
+       // placeholder for any debugging desired when a config variable
        // is set but to the same value as it already has
 }