summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-06-03 12:30:26 +0200
committerRobin Gareus <robin@gareus.org>2017-06-03 13:55:02 +0200
commitc2cb60ea03d057bdd36d20c5aa47efaacdf410e9 (patch)
treec34ef600ae99ec9b0129ac12d4fcead7688a04b5
parent0c57199a6ca4e6681ad934873dc107f0ef83a8ee (diff)
add const-ness: Evaluating a curve does not change it.
Note that the ControlList's lock and cache are already mutable.
-rw-r--r--libs/evoral/evoral/Curve.hpp10
-rw-r--r--libs/evoral/src/Curve.cpp10
2 files changed, 10 insertions, 10 deletions
diff --git a/libs/evoral/evoral/Curve.hpp b/libs/evoral/evoral/Curve.hpp
index bf2de520a0..85158cbc54 100644
--- a/libs/evoral/evoral/Curve.hpp
+++ b/libs/evoral/evoral/Curve.hpp
@@ -33,17 +33,17 @@ class LIBEVORAL_API Curve : public boost::noncopyable
public:
Curve (const ControlList& cl);
- bool rt_safe_get_vector (double x0, double x1, float *arg, int32_t veclen);
- void get_vector (double x0, double x1, float *arg, int32_t veclen);
+ bool rt_safe_get_vector (double x0, double x1, float *arg, int32_t veclen) const;
+ void get_vector (double x0, double x1, float *arg, int32_t veclen) const;
- void solve ();
+ void solve () const;
void mark_dirty() const { _dirty = true; }
private:
- double multipoint_eval (double x);
+ double multipoint_eval (double x) const;
- void _get_vector (double x0, double x1, float *arg, int32_t veclen);
+ void _get_vector (double x0, double x1, float *arg, int32_t veclen) const;
mutable bool _dirty;
const ControlList& _list;
diff --git a/libs/evoral/src/Curve.cpp b/libs/evoral/src/Curve.cpp
index a8605c6f1d..83fd0756bd 100644
--- a/libs/evoral/src/Curve.cpp
+++ b/libs/evoral/src/Curve.cpp
@@ -42,7 +42,7 @@ Curve::Curve (const ControlList& cl)
}
void
-Curve::solve ()
+Curve::solve () const
{
uint32_t npoints;
@@ -169,7 +169,7 @@ Curve::solve ()
}
bool
-Curve::rt_safe_get_vector (double x0, double x1, float *vec, int32_t veclen)
+Curve::rt_safe_get_vector (double x0, double x1, float *vec, int32_t veclen) const
{
Glib::Threads::RWLock::ReaderLock lm(_list.lock(), Glib::Threads::TRY_LOCK);
@@ -182,14 +182,14 @@ Curve::rt_safe_get_vector (double x0, double x1, float *vec, int32_t veclen)
}
void
-Curve::get_vector (double x0, double x1, float *vec, int32_t veclen)
+Curve::get_vector (double x0, double x1, float *vec, int32_t veclen) const
{
Glib::Threads::RWLock::ReaderLock lm(_list.lock());
_get_vector (x0, x1, vec, veclen);
}
void
-Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen)
+Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen) const
{
double rx, lx, hx, max_x, min_x;
int32_t i;
@@ -329,7 +329,7 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen)
}
double
-Curve::multipoint_eval (double x)
+Curve::multipoint_eval (double x) const
{
pair<ControlList::EventList::const_iterator,ControlList::EventList::const_iterator> range;