Coding style cleanups. Preserve mono state in XML for panners.

[ardour.git] / libs / evoral / src / ControlSet.cpp

diff --git a/libs/evoral/src/ControlSet.cpp b/libs/evoral/src/ControlSet.cpp
index 06046347a625139e2f5e95f69cb9e61ca7c774a0..29d3b40344d9e991c650e77a5436a78ae068622b 100644 (file)
--- a/libs/evoral/src/ControlSet.cpp
+++ b/libs/evoral/src/ControlSet.cpp
@@ -1,26 +1,26 @@
 /* This file is part of Evoral.
  * Copyright (C) 2008 Dave Robillard <http://drobilla.net>
  * Copyright (C) 2000-2008 Paul Davis
- * 
+ *
  * Evoral is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version.
- * 
+ *
  * Evoral is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <limits>
-#include <evoral/ControlSet.hpp>
-#include <evoral/ControlList.hpp>
-#include <evoral/Control.hpp>
-#include <evoral/Event.hpp>
+#include "evoral/ControlSet.hpp"
+#include "evoral/ControlList.hpp"
+#include "evoral/Control.hpp"
+#include "evoral/Event.hpp"
 
 using namespace std;
 
@@ -64,7 +64,6 @@ ControlSet::control (const Parameter& parameter, bool create_if_missing)
                return ac;
 
        } else {
-               //warning << "ControlList " << parameter.to_string() << " not found for " << _name << endmsg;
                return boost::shared_ptr<Control>();
        }
 }
@@ -72,22 +71,22 @@ ControlSet::control (const Parameter& parameter, bool create_if_missing)
 bool
 ControlSet::find_next_event (FrameTime now, FrameTime end, ControlEvent& next_event) const
 {
-       Controls::const_iterator li;    
+       Controls::const_iterator li;
 
        next_event.when = std::numeric_limits<FrameTime>::max();
-       
+
        for (li = _controls.begin(); li != _controls.end(); ++li) {
                ControlList::const_iterator i;
                boost::shared_ptr<const ControlList> alist (li->second->list());
                ControlEvent cp (now, 0.0f);
-               
+
                for (i = lower_bound (alist->begin(), alist->end(), &cp, ControlList::time_comparator);
                                i != alist->end() && (*i)->when < end; ++i) {
                        if ((*i)->when > now) {
-                               break; 
+                               break;
                        }
                }
-               
+
                if (i != alist->end() && (*i)->when < end) {
                        if ((*i)->when < next_event.when) {
                                next_event.when = (*i)->when;
@@ -99,7 +98,7 @@ ControlSet::find_next_event (FrameTime now, FrameTime end, ControlEvent& next_ev
 }
 
 void
-ControlSet::clear ()
+ControlSet::clear_controls ()
 {
        Glib::Mutex::Lock lm (_control_lock);