Remove weird/pointless Automatable::data().

git-svn-id: svn://localhost/ardour2/branches/3.0@6637 d708f5d6-7413-0410-9779-e7cbd77b26cf

3 files changed, 4 insertions, 7 deletions

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index c2d13667dd..8b95881dc2 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -142,12 +142,12 @@ class AudioRegion : public Region
 
 	boost::shared_ptr<Evoral::Control>
 	control(const Evoral::Parameter& id, bool create=false) {
-		return _automatable.data().control(id, create);
+		return _automatable.control(id, create);
 	}
 
 	virtual boost::shared_ptr<const Evoral::Control>
 	control(const Evoral::Parameter& id) const {
-		return _automatable.data().control(id);
+		return _automatable.control(id);
 	}
 
 	/* export */
diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index 7bfd43ec02..3236d816c3 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -90,9 +90,6 @@ public:
 
 	typedef Evoral::ControlSet::Controls Controls;
 
-	Evoral::ControlSet&       data()       { return *dynamic_cast<Evoral::ControlSet*>(this); }
-	const Evoral::ControlSet& data() const { return *dynamic_cast<const Evoral::ControlSet*>(this); }
-
 	int set_automation_state (const XMLNode&, Evoral::Parameter default_param);
 	XMLNode& get_automation_state();
 
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 5bd338b39e..1c83c838a7 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -78,12 +78,12 @@ class MidiRegion : public Region
 
 	boost::shared_ptr<Evoral::Control>
 	control(const Evoral::Parameter& id, bool create=false) {
-		return model()->data().control(id, create);
+		return model()->control(id, create);
 	}
 
 	virtual boost::shared_ptr<const Evoral::Control>
 	control(const Evoral::Parameter& id) const {
-		return model()->data().control(id);
+		return model()->control(id);
 	}
 
 	/* export */