diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-02 18:05:26 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-02 18:05:26 +0000 |
| commit | 17088ee3ea5af1e6174b098bb5bcfdaec6ebf9b0 (patch) | |
| tree | cbf9fe8fb94212f9a50c6b760ebaac3b4a1bcec6 /libs/surfaces | |
| parent | a5ab2e99e19d5f5d4c1f91f38cd774fefdf257dc (diff) | |
(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
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/osc/osc_controllable.cc | 6 | ||||
| -rw-r--r-- | libs/surfaces/osc/osc_controllable.h | 4 |
2 files changed, 5 insertions, 5 deletions
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 (); diff --git a/libs/surfaces/osc/osc_controllable.h b/libs/surfaces/osc/osc_controllable.h index 55e2815d35..828c3769f5 100644 --- a/libs/surfaces/osc/osc_controllable.h +++ b/libs/surfaces/osc/osc_controllable.h @@ -50,7 +50,7 @@ class OSCControllable : public PBD::Stateful lo_address addr; std::string path; - virtual void send_change (); + virtual void send_change_message (); }; class OSCRouteControllable : public OSCControllable @@ -67,7 +67,7 @@ class OSCRouteControllable : public OSCControllable private: boost::shared_ptr<ARDOUR::Route> _route; - void send_change (); + void send_change_message (); }; #endif /* __osc_osccontrollable_h__ */ |