From 17088ee3ea5af1e6174b098bb5bcfdaec6ebf9b0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 2 Mar 2010 18:05:26 +0000 Subject: (1) remove most uses of MementoCommand for Playlist and Region (2) move frozen state from Region into Stateful, renamed "suspend property changes" (3) successive changes to a Property (scalar) after clear_history() do not keep resetting the old value (fixes region trim) git-svn-id: svn://localhost/ardour2/branches/3.0@6720 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/surfaces/osc/osc_controllable.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/surfaces/osc/osc_controllable.cc') diff --git a/libs/surfaces/osc/osc_controllable.cc b/libs/surfaces/osc/osc_controllable.cc index baf888667e..001eca6f3e 100644 --- a/libs/surfaces/osc/osc_controllable.cc +++ b/libs/surfaces/osc/osc_controllable.cc @@ -36,7 +36,7 @@ OSCControllable::OSCControllable (lo_address a, const std::string& p, boost::sha , addr (a) , path (p) { - c->Changed.connect (changed_connection, boost::bind (&OSCControllable::send_change, this), OSC::instance()); + c->Changed.connect (changed_connection, boost::bind (&OSCControllable::send_change_message, this), OSC::instance()); } OSCControllable::~OSCControllable () @@ -58,7 +58,7 @@ OSCControllable::set_state (const XMLNode& /*node*/, int /*version*/) } void -OSCControllable::send_change () +OSCControllable::send_change_message () { lo_message msg = lo_message_new (); @@ -84,7 +84,7 @@ OSCRouteControllable::~OSCRouteControllable () } void -OSCRouteControllable::send_change () +OSCRouteControllable::send_change_message () { lo_message msg = lo_message_new (); -- cgit v1.2.3