Add history_suffix to ardour/filename_extensions.cc

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

diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index dfdcf82cab7db7aa2619d24e38dc925c4ca3ca35..0609b8d38037bac67abbb8dbe2a7a5c220b66600 100644 (file)
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -125,8 +125,6 @@ Automatable::add_control(boost::shared_ptr<AutomationControl> ac)
 
        _controls[param] = ac;
        
-       cerr << _name << ": added parameter " << param.to_string() << endl;
-
        _can_automate_list.insert(param);
 
        // Sync everything (derived classes) up to initial values
@@ -232,7 +230,6 @@ bool
 Automatable::find_next_event (nframes_t now, nframes_t end, ControlEvent& next_event) const
 {
        Controls::const_iterator li;    
-       AutomationList::TimeComparator cmp;
 
        next_event.when = max_frames;
        
@@ -242,7 +239,8 @@ Automatable::find_next_event (nframes_t now, nframes_t end, ControlEvent& next_e
                boost::shared_ptr<const AutomationList> alist (li->second->list());
                ControlEvent cp (now, 0.0f);
                
-               for (i = lower_bound (alist->const_begin(), alist->const_end(), &cp, cmp); i != alist->const_end() && (*i)->when < end; ++i) {
+               for (i = lower_bound (alist->const_begin(), alist->const_end(), &cp, AutomationList::time_comparator);
+                               i != alist->const_end() && (*i)->when < end; ++i) {
                        if ((*i)->when > now) {
                                break; 
                        }
@@ -459,7 +457,6 @@ Automatable::control_factory(boost::shared_ptr<AutomationList> list)
                // FIXME: this will die horribly if this is not a MidiTrack
                return boost::shared_ptr<AutomationControl>(new MidiTrack::MidiControl((MidiTrack*)this, list));
        } else {
-               cerr << "WARNING: Default AutomationControl created for " << list->parameter().to_string() << endl;
                return boost::shared_ptr<AutomationControl>(new AutomationControl(_session, list));
        }
 }