From c2cb60ea03d057bdd36d20c5aa47efaacdf410e9 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 3 Jun 2017 12:30:26 +0200 Subject: [PATCH] add const-ness: Evaluating a curve does not change it. Note that the ControlList's lock and cache are already mutable. --- libs/evoral/evoral/Curve.hpp | 10 +++++----- libs/evoral/src/Curve.cpp | 10 +++++----- 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 range; -- 2.30.2