From 912346057c44f53b7a07a03a66656bb67b86add6 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 5 Jul 2007 01:31:43 +0000 Subject: [PATCH] Remove unneeded cruft from Curve. git-svn-id: svn://localhost/ardour2/trunk@2108 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/curve.h | 15 ++++++--------- libs/ardour/curve.cc | 33 +++------------------------------ 2 files changed, 9 insertions(+), 39 deletions(-) diff --git a/libs/ardour/ardour/curve.h b/libs/ardour/ardour/curve.h index 1010e7ef18..433b00a270 100644 --- a/libs/ardour/ardour/curve.h +++ b/libs/ardour/ardour/curve.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2003 Paul Davis + Copyright (C) 2001-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,6 +21,7 @@ #define __ardour_curve_h__ #include +#include #include #include #include @@ -30,14 +31,10 @@ namespace ARDOUR { -class Curve +class Curve : public boost::noncopyable { public: Curve (const AutomationList& al); - ~Curve (); - Curve (const Curve& other); - //Curve (const Curve& other, double start, double end); - /*Curve (const XMLNode&, Parameter id);*/ 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); @@ -50,10 +47,10 @@ class Curve void _get_vector (double x0, double x1, float *arg, int32_t veclen); - const AutomationList& _list; - void on_list_dirty() { _dirty = true; } - bool _dirty; + + bool _dirty; + const AutomationList& _list; }; } // namespace ARDOUR diff --git a/libs/ardour/curve.cc b/libs/ardour/curve.cc index 17567c203a..380074fa19 100644 --- a/libs/ardour/curve.cc +++ b/libs/ardour/curve.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2003 Paul Davis + Copyright (C) 2001-2007 Paul Davis Contains ideas derived from "Constrained Cubic Spline Interpolation" by CJC Kruger (www.korf.co.uk/spline.pdf). @@ -41,39 +41,12 @@ using namespace sigc; using namespace PBD; Curve::Curve (const AutomationList& al) - : _list (al) - , _dirty (true) + : _dirty (true) + , _list (al) { _list.Dirty.connect(mem_fun(*this, &Curve::on_list_dirty)); } -Curve::Curve (const Curve& other) - : _list (other._list) - , _dirty (true) -{ - _list.Dirty.connect(mem_fun(*this, &Curve::on_list_dirty)); -} -#if 0 -Curve::Curve (const Curve& other, double start, double end) - : _list (other._list) -{ - _min_yval = other._min_yval; - _max_yval = other._max_yval; -} - -/** \a id is used for legacy sessions where the type is not present - * in or below the node. It is used if \a id is non-null. - */ -Curve::Curve (const XMLNode& node, Parameter id) - : AutomationList (node, id) -{ -} -#endif - -Curve::~Curve () -{ -} - void Curve::solve () {