#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;
OSCControllable::OSCControllable (lo_address a, const std::string& p, boost::shared_ptr<Controllable> c)
: controllable (c)
- , addr (a)
, 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 ()
{
+ changed_connection.disconnect();
lo_address_free (addr);
}
}
void
-OSCControllable::send_change ()
+OSCControllable::send_change_message ()
{
lo_message msg = lo_message_new ();
}
void
-OSCRouteControllable::send_change ()
+OSCRouteControllable::send_change_message ()
{
lo_message msg = lo_message_new ();
/* 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);
}