Remove Cruft -- AutomationStyle never did anything.

Trim automation is planned via SlavableAC as normal AutomationMode.
Some of this code have a revival (a special "Trim+Preview" state
before merging Automation but that has to be more general than Pan & Gain.

7 files changed, 0 insertions, 42 deletions

diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index f23948412f..8adfb88aae 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -91,9 +91,6 @@ public:
 	AutoState get_parameter_automation_state (Evoral::Parameter param);
 	virtual void set_parameter_automation_state (Evoral::Parameter param, AutoState);
 
-	AutoStyle get_parameter_automation_style (Evoral::Parameter param);
-	void set_parameter_automation_style (Evoral::Parameter param, AutoStyle);
-
 	void protect_automation ();
 
 	const std::set<Evoral::Parameter>& what_can_be_automated() const { return _can_automate_list; }
diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h
index 9879767807..6787abd87a 100644
--- a/libs/ardour/ardour/automation_control.h
+++ b/libs/ardour/ardour/automation_control.h
@@ -82,12 +82,7 @@ public:
 		return alist() ? alist()->automation_state() : Off;
 	}
 
-	inline AutoStyle automation_style() const {
-		return alist() ? alist()->automation_style() : Absolute;
-	}
-
 	void set_automation_state(AutoState as);
-	void set_automation_style(AutoStyle as);
 	void start_touch(double when);
 	void stop_touch(bool mark, double when);
 
diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h
index 3f4d3f2f52..34f0a99eb1 100644
--- a/libs/ardour/ardour/automation_list.h
+++ b/libs/ardour/ardour/automation_list.h
@@ -88,10 +88,6 @@ class LIBARDOUR_API AutomationList : public Evoral::ControlList, public PBD::Sta
 	AutoState automation_state() const { return _state; }
 	PBD::Signal1<void, AutoState> automation_state_changed;
 
-	void set_automation_style (AutoStyle m);
-	AutoStyle automation_style() const { return _style; }
-	PBD::Signal0<void> automation_style_changed;
-
 	bool automation_playback() const {
 		return (_state & Play) || ((_state & Touch) && !touching());
 	}
@@ -130,7 +126,6 @@ class LIBARDOUR_API AutomationList : public Evoral::ControlList, public PBD::Sta
 	void maybe_signal_changed ();
 
 	AutoState    _state;
-	AutoStyle    _style;
 	gint         _touching;
 
 	bool operator== (const AutomationList&) const { /* not called */ abort(); return false; }
diff --git a/libs/ardour/ardour/pannable.h b/libs/ardour/ardour/pannable.h
index fd8ffe6c28..bdac270891 100644
--- a/libs/ardour/ardour/pannable.h
+++ b/libs/ardour/ardour/pannable.h
@@ -57,10 +57,6 @@ class LIBARDOUR_API Pannable : public PBD::Stateful, public Automatable, public
 	AutoState automation_state() const { return _auto_state; }
 	PBD::Signal1<void, AutoState> automation_state_changed;
 
-	void set_automation_style (AutoStyle m);
-	AutoStyle automation_style() const { return _auto_style; }
-	PBD::Signal0<void> automation_style_changed;
-
 	bool automation_playback() const {
 		return (_auto_state & Play) || ((_auto_state & Touch) && !touching());
 	}
@@ -85,7 +81,6 @@ class LIBARDOUR_API Pannable : public PBD::Stateful, public Automatable, public
   protected:
 	boost::weak_ptr<Panner> _panner;
 	AutoState _auto_state;
-	AutoStyle _auto_style;
 	gint      _touching;
 	bool      _has_state;
 	uint32_t  _responding_to_control_auto_state_change;
diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h
index 362a49851a..0773250094 100644
--- a/libs/ardour/ardour/panner.h
+++ b/libs/ardour/ardour/panner.h
@@ -105,8 +105,6 @@ public:
 
 	void      set_automation_state (AutoState);
 	AutoState automation_state() const;
-	void      set_automation_style (AutoStyle);
-	AutoStyle automation_style() const;
 
 	virtual std::set<Evoral::Parameter> what_can_be_automated() const;
 	virtual std::string describe_parameter (Evoral::Parameter);
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 0076a72a1f..ffda1ca42d 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -184,14 +184,6 @@ namespace ARDOUR {
 	std::string auto_state_to_string (AutoState);
 	AutoState string_to_auto_state (std::string);
 
-	enum AutoStyle {
-		Absolute = 0x1,
-		Trim = 0x2
-	};
-
-	std::string auto_style_to_string (AutoStyle);
-	AutoStyle string_to_auto_style (std::string);
-
 	enum AlignStyle {
 		CaptureTime,
 		ExistingMaterial
diff --git a/libs/ardour/ardour/types_convert.h b/libs/ardour/ardour/types_convert.h
index cee969dd00..52cf616c29 100644
--- a/libs/ardour/ardour/types_convert.h
+++ b/libs/ardour/ardour/types_convert.h
@@ -89,20 +89,6 @@ inline bool string_to (const std::string& str, ARDOUR::AutoState& as)
 }
 
 template <>
-inline bool to_string (ARDOUR::AutoStyle val, std::string& str)
-{
-	str = ARDOUR::auto_style_to_string (val);
-	return true;
-}
-
-template <>
-inline bool string_to (const std::string& str, ARDOUR::AutoStyle& as)
-{
-	as = ARDOUR::string_to_auto_style (str);
-	return true;
-}
-
-template <>
 inline bool to_string (ARDOUR::DataType val, std::string& str)
 {
 	str = val.to_string();