smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

make AutomationList::operator==() private and abort() as its core, because it should never be called/used.

Browse source 
Also make AutomationList::operator=() use ControlList::operator=() rather than try to reimplement it
This commit is contained in:
Paul Davis 2014-07-09 14:28:01 -04:00
parent 2a852cfc75
commit 9e8b50f075
2 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/ardour/automation_list.h
View file

@ -21,6 +21,7 @@
#define __ardour_automation_event_h__
#include <stdint.h>
#include <cstdlib>
#include <list>
#include <cmath>
@ -71,7 +72,6 @@ class LIBARDOUR_API AutomationList : public PBD::StatefulDestructible, public Ev
virtual boost::shared_ptr<Evoral::ControlList> create(Evoral::Parameter id);
AutomationList& operator= (const AutomationList&);
bool operator== (const AutomationList&);
void thaw ();
@ -116,6 +116,8 @@ class LIBARDOUR_API AutomationList : public PBD::StatefulDestructible, public Ev
AutoState _state;
AutoStyle _style;
gint _touching;
bool operator== (const AutomationList&) const { /* not called */ abort(); return false; }
};
} // namespace

18
libs/ardour/automation_list.cc
View file

@ -137,26 +137,16 @@ AutomationList::create_curve_if_necessary()
}
}
bool
AutomationList::operator== (const AutomationList& other)
{
return _events == other._events;
}
AutomationList&
AutomationList::operator= (const AutomationList& other)
{
if (this != &other) {
_events.clear ();
for (const_iterator i = other._events.begin(); i != other._events.end(); ++i) {
_events.push_back (new Evoral::ControlEvent (**i));
}
_min_yval = other._min_yval;
_max_yval = other._max_yval;
_default_value = other._default_value;
ControlList::operator= (other);
_state = other._state;
_style = other._style;
_touching = other._touching;
mark_dirty ();
maybe_signal_changed ();