summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-07-24 01:22:50 +0200
committerRobin Gareus <robin@gareus.org>2017-07-24 01:59:18 +0200
commitfde0e293a30ed4e689208b456a4431b7bb278eb4 (patch)
tree93686a5c6e7df13ea7acd577c8de402ee4a6947f /libs/ardour
parentf04bacdfac885e927809ee0d3a323defda42033b (diff)
Remove unused "mark" parameter from stop_touch() API
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/ardour/automation_control.h2
-rw-r--r--libs/ardour/ardour/automation_list.h2
-rw-r--r--libs/ardour/ardour/pannable.h2
-rw-r--r--libs/ardour/automatable.cc2
-rw-r--r--libs/ardour/automation_control.cc5
-rw-r--r--libs/ardour/automation_list.cc12
-rw-r--r--libs/ardour/automation_watch.cc2
-rw-r--r--libs/ardour/lv2_plugin.cc2
-rw-r--r--libs/ardour/pannable.cc4
-rw-r--r--libs/ardour/plugin_insert.cc2
10 files changed, 12 insertions, 23 deletions
diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h
index 0ac4a08c7b..6ffcb3b866 100644
--- a/libs/ardour/ardour/automation_control.h
+++ b/libs/ardour/ardour/automation_control.h
@@ -84,7 +84,7 @@ public:
void set_automation_state(AutoState as);
void start_touch(double when);
- void stop_touch(bool mark, double when);
+ void stop_touch(double when);
/* inherited from PBD::Controllable. */
virtual double get_value () const;
diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h
index 9810275ed1..65268d503a 100644
--- a/libs/ardour/ardour/automation_list.h
+++ b/libs/ardour/ardour/automation_list.h
@@ -103,7 +103,7 @@ public:
void write_pass_finished (double when, double thinning_factor=0.0);
void start_touch (double when);
- void stop_touch (bool mark, double when);
+ void stop_touch (double when);
bool touching() const { return g_atomic_int_get (const_cast<gint*>(&_touching)); }
bool writing() const { return _state == Write; }
bool touch_enabled() const { return _state == Touch; }
diff --git a/libs/ardour/ardour/pannable.h b/libs/ardour/ardour/pannable.h
index bdac270891..cd88a250cf 100644
--- a/libs/ardour/ardour/pannable.h
+++ b/libs/ardour/ardour/pannable.h
@@ -67,7 +67,7 @@ class LIBARDOUR_API Pannable : public PBD::Stateful, public Automatable, public
std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
void start_touch (double when);
- void stop_touch (bool mark, double when);
+ void stop_touch (double when);
bool touching() const { return g_atomic_int_get (const_cast<gint*>(&_touching)); }
bool writing() const { return _auto_state == Write; }
bool touch_enabled() const { return _auto_state == Touch; }
diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index 19678ec19c..a8f755da5e 100644
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -379,7 +379,7 @@ Automatable::non_realtime_transport_stop (framepos_t now, bool /*flush_processor
*/
const bool list_did_write = !l->in_new_write_pass ();
- l->stop_touch (true, now);
+ l->stop_touch (now);
c->commit_transaction (list_did_write);
diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index c3ad2481d6..274e84f9f0 100644
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -291,17 +291,16 @@ AutomationControl::start_touch(double when)
}
void
-AutomationControl::stop_touch(bool mark, double when)
+AutomationControl::stop_touch(double when)
{
if (!_list) return;
if (touching()) {
set_touching (false);
if (alist()->automation_state() == Touch) {
- alist()->stop_touch (mark, when);
+ alist()->stop_touch (when);
if (!_desc.toggled) {
AutomationWatch::instance().remove_automation_watch (shared_from_this());
-
}
}
}
diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index 27bc64462e..74181d5514 100644
--- a/libs/ardour/automation_list.cc
+++ b/libs/ardour/automation_list.cc
@@ -257,7 +257,7 @@ AutomationList::start_touch (double when)
}
void
-AutomationList::stop_touch (bool mark, double)
+AutomationList::stop_touch (double)
{
if (g_atomic_int_get (&_touching) == 0) {
/* this touch has already been stopped (probably by Automatable::transport_stopped),
@@ -267,16 +267,6 @@ AutomationList::stop_touch (bool mark, double)
}
g_atomic_int_set (&_touching, 0);
-
- if (_state == Touch) {
-
- if (mark) {
-
- /* XXX need to mark the last added point with the
- * current time
- */
- }
- }
}
/* _before may be owned by the undo stack,
diff --git a/libs/ardour/automation_watch.cc b/libs/ardour/automation_watch.cc
index d1118e7669..a7a7a36eed 100644
--- a/libs/ardour/automation_watch.cc
+++ b/libs/ardour/automation_watch.cc
@@ -138,7 +138,7 @@ AutomationWatch::transport_stop_automation_watches (framepos_t when)
}
for (AutomationWatches::iterator i = tmp.begin(); i != tmp.end(); ++i) {
- (*i)->stop_touch (true, when);
+ (*i)->stop_touch (when);
}
}
diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index d1cf26f266..2911c6c763 100644
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -2811,7 +2811,7 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
AutomationCtrlPtr c = get_automation_control (p);
DEBUG_TRACE(DEBUG::LV2Automate, string_compose ("End Touch p: %1\n", p));
if (c) {
- c->ac->stop_touch (true, std::max ((framepos_t)0, start - _current_latency));
+ c->ac->stop_touch (std::max ((framepos_t)0, start - _current_latency));
}
}
}
diff --git a/libs/ardour/pannable.cc b/libs/ardour/pannable.cc
index 1298b85d90..32bf2fe33f 100644
--- a/libs/ardour/pannable.cc
+++ b/libs/ardour/pannable.cc
@@ -150,14 +150,14 @@ Pannable::start_touch (double when)
}
void
-Pannable::stop_touch (bool mark, double when)
+Pannable::stop_touch (double when)
{
const Controls& c (controls());
for (Controls::const_iterator ci = c.begin(); ci != c.end(); ++ci) {
boost::shared_ptr<AutomationControl> ac = boost::dynamic_pointer_cast<AutomationControl>(ci->second);
if (ac) {
- ac->alist()->stop_touch (mark, when);
+ ac->alist()->stop_touch (when);
}
}
g_atomic_int_set (&_touching, 0);
diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc
index 7c9c71ccf0..762b87149e 100644
--- a/libs/ardour/plugin_insert.cc
+++ b/libs/ardour/plugin_insert.cc
@@ -3078,7 +3078,7 @@ PluginInsert::end_touch (uint32_t param_id)
boost::shared_ptr<AutomationControl> ac = automation_control (Evoral::Parameter (PluginAutomation, 0, param_id));
if (ac) {
// ToDo subtract _plugin_signal_latency from audible_frame() when rolling, assert > 0
- ac->stop_touch (true, session().audible_frame());
+ ac->stop_touch (session().audible_frame());
}
}