/*
Copyright (C) 2009 Paul Davis
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
#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;
using namespace PBD;
using namespace ARDOUR;
+using namespace ArdourSurface;
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);
}
}
int
-OSCControllable::set_state (const XMLNode& /*node*/)
+OSCControllable::set_state (const XMLNode& /*node*/, int /*version*/)
{
return 0;
}
void
-OSCControllable::send_change ()
+OSCControllable::send_change_message ()
{
lo_message msg = lo_message_new ();
-
+
lo_message_add_float (msg, (float) controllable->get_value());
/* XXX thread issues */
lo_message_free (msg);
}
-/*------------------------------------------------------------*/
+/*------------------------------------------------------------*/
-OSCRouteControllable::OSCRouteControllable (lo_address a, const std::string& p,
+OSCRouteControllable::OSCRouteControllable (lo_address a, const std::string& p,
boost::shared_ptr<Controllable> c, boost::shared_ptr<Route> r)
: OSCControllable (a, p, c)
, _route (r)
}
void
-OSCRouteControllable::send_change ()
+OSCRouteControllable::send_change_message ()
{
lo_message msg = lo_message_new ();
- lo_message_add_int32 (msg, _route->remote_control_id());
+ /* Can only send ID part of RID at present */
+
+ lo_message_add_int32 (msg, _route->presentation_info().group_order());
lo_message_add_float (msg, (float) controllable->get_value());
/* 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);
}