projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix indentation
[ardour.git]
/
libs
/
surfaces
/
osc
/
osc_controllable.cc
diff --git
a/libs/surfaces/osc/osc_controllable.cc
b/libs/surfaces/osc/osc_controllable.cc
index ed805466b018a5b99ba2c4cb265da531929ed3c1..3e6285563d642689f54ec12d5e6260c72b38ccf6 100644
(file)
--- a/
libs/surfaces/osc/osc_controllable.cc
+++ b/
libs/surfaces/osc/osc_controllable.cc
@@
-19,11
+19,12
@@
#include <cstdio> /* for sprintf, sigh */
#include <climits>
#include <cstdio> /* for sprintf, sigh */
#include <climits>
-#include
<pbd/error.h>
-#include
<pbd/xml++.h>
+#include
"pbd/error.h"
+#include
"pbd/xml++.h"
-#include
<ardour/route.h>
+#include
"ardour/route.h"
+#include "osc.h"
#include "osc_controllable.h"
using namespace sigc;
#include "osc_controllable.h"
using namespace sigc;
@@
-32,14
+33,15
@@
using namespace ARDOUR;
OSCControllable::OSCControllable (lo_address a, const std::string& p, boost::shared_ptr<Controllable> c)
: controllable (c)
OSCControllable::OSCControllable (lo_address a, const std::string& p, boost::shared_ptr<Controllable> c)
: controllable (c)
- , addr (a)
, path (p)
{
, path (p)
{
- c->Changed.connect (mem_fun (*this, &OSCControllable::send_change));
+ addr = lo_address_new (lo_address_get_hostname(a) , lo_address_get_port(a));
+ c->Changed.connect (changed_connection, MISSING_INVALIDATOR, boost::bind (&OSCControllable::send_change_message, this), OSC::instance());
}
OSCControllable::~OSCControllable ()
{
}
OSCControllable::~OSCControllable ()
{
+ changed_connection.disconnect();
lo_address_free (addr);
}
lo_address_free (addr);
}
@@
-57,7
+59,7
@@
OSCControllable::set_state (const XMLNode& /*node*/, int /*version*/)
}
void
}
void
-OSCControllable::send_change ()
+OSCControllable::send_change
_message
()
{
lo_message msg = lo_message_new ();
{
lo_message msg = lo_message_new ();
@@
-83,7
+85,7
@@
OSCRouteControllable::~OSCRouteControllable ()
}
void
}
void
-OSCRouteControllable::send_change ()
+OSCRouteControllable::send_change
_message
()
{
lo_message msg = lo_message_new ();
{
lo_message msg = lo_message_new ();
@@
-92,7
+94,8
@@
OSCRouteControllable::send_change ()
/* XXX thread issues */
/* XXX thread issues */
- std::cerr << "ORC: send " << path << " = " << controllable->get_value() << std::endl;
+ //std::cerr << "ORC: send " << path << " = " << controllable->get_value() << std::endl;
+
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
}
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
}