smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

Changes needed for building surfaces/osc (control surface protocol) with MSVC

Browse source 
(for testing on the non-Windows platforms)
This commit is contained in:
John Emmas 2014-07-22 22:19:46 +01:00
parent fdaa6a151a
commit 7984cd2321
2 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libs/surfaces/osc/interface.cc
View file

@ -46,15 +46,15 @@ probe_osc_protocol (ControlProtocolDescriptor* /*descriptor*/)
} }
static ControlProtocolDescriptor osc_descriptor = { static ControlProtocolDescriptor osc_descriptor = {
name : "Open Sound Control (OSC)", /*name : */ "Open Sound Control (OSC)",
id : "uri://ardour.org/surfaces/osc:0", /*id : */ "uri://ardour.org/surfaces/osc:0",
ptr : 0, /*ptr : */ 0,
module : 0, /*module : */ 0,
mandatory : 0, /*mandatory : */ 0,
supports_feedback : true, /*supports_feedback : */ true,
probe : probe_osc_protocol, /*probe : */ probe_osc_protocol,
initialize : new_osc_protocol, /*initialize : */ new_osc_protocol,
destroy : delete_osc_protocol /*destroy : */ delete_osc_protocol
}; };
extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &osc_descriptor; } extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &osc_descriptor; }

14
libs/surfaces/osc/osc_route_observer.cc
View file

@ -29,10 +29,8 @@
#include "i18n.h" #include "i18n.h"
using namespace std; using namespace std;
using namespace sigc;
using namespace PBD; using namespace PBD;
using namespace ARDOUR; using namespace ARDOUR;
using namespace boost;
OSCRouteObserver::OSCRouteObserver (boost::shared_ptr<Route> r, lo_address a) OSCRouteObserver::OSCRouteObserver (boost::shared_ptr<Route> r, lo_address a)
: _route (r) : _route (r)
@ -41,21 +39,21 @@ OSCRouteObserver::OSCRouteObserver (boost::shared_ptr<Route> r, lo_address a)
_route->PropertyChanged.connect (name_changed_connection, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::name_changed, this, boost::lambda::_1), OSC::instance()); _route->PropertyChanged.connect (name_changed_connection, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::name_changed, this, boost::lambda::_1), OSC::instance());
if (dynamic_pointer_cast<AudioTrack>(_route) || dynamic_pointer_cast<MidiTrack>(_route)) { if (boost::dynamic_pointer_cast<AudioTrack>(_route) || boost::dynamic_pointer_cast<MidiTrack>(_route)) {
boost::shared_ptr<Track> track = dynamic_pointer_cast<Track>(r); boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track>(r);
boost::shared_ptr<Controllable> rec_controllable = dynamic_pointer_cast<Controllable>(track->rec_enable_control()); boost::shared_ptr<Controllable> rec_controllable = boost::dynamic_pointer_cast<Controllable>(track->rec_enable_control());
rec_controllable->Changed.connect (rec_changed_connection, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/route/rec"), track->rec_enable_control()), OSC::instance()); rec_controllable->Changed.connect (rec_changed_connection, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/route/rec"), track->rec_enable_control()), OSC::instance());
} }
boost::shared_ptr<Controllable> mute_controllable = dynamic_pointer_cast<Controllable>(_route->mute_control()); boost::shared_ptr<Controllable> mute_controllable = boost::dynamic_pointer_cast<Controllable>(_route->mute_control());
mute_controllable->Changed.connect (mute_changed_connection, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/route/mute"), _route->mute_control()), OSC::instance()); mute_controllable->Changed.connect (mute_changed_connection, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/route/mute"), _route->mute_control()), OSC::instance());
boost::shared_ptr<Controllable> solo_controllable = dynamic_pointer_cast<Controllable>(_route->solo_control()); boost::shared_ptr<Controllable> solo_controllable = boost::dynamic_pointer_cast<Controllable>(_route->solo_control());
solo_controllable->Changed.connect (solo_changed_connection, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/route/solo"), _route->solo_control()), OSC::instance()); solo_controllable->Changed.connect (solo_changed_connection, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/route/solo"), _route->solo_control()), OSC::instance());
boost::shared_ptr<Controllable> gain_controllable = dynamic_pointer_cast<Controllable>(_route->gain_control()); boost::shared_ptr<Controllable> gain_controllable = boost::dynamic_pointer_cast<Controllable>(_route->gain_control());
gain_controllable->Changed.connect (gain_changed_connection, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/route/gain"), _route->gain_control()), OSC::instance()); gain_controllable->Changed.connect (gain_changed_connection, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/route/gain"), _route->gain_control()), OSC::instance());
} }