summaryrefslogtreecommitdiff
path: root/libs/surfaces/osc/osc_controllable.cc
diff options
context:
space:
mode:
authorNick Mainsbridge <beatroute@iprimus.com.au>2009-05-13 15:45:38 +0000
committerNick Mainsbridge <beatroute@iprimus.com.au>2009-05-13 15:45:38 +0000
commite341132df82daa96dd276fe6b57aaae787fd084a (patch)
tree7e7661770d980e0ae9d7fdd834245d63f9823b7f /libs/surfaces/osc/osc_controllable.cc
parent72f12095201ae2027b0b046aed4bb43d931abc71 (diff)
Compilation fixes from using namespace removal.
git-svn-id: svn://localhost/ardour2/branches/3.0@5072 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/osc/osc_controllable.cc')
-rw-r--r--libs/surfaces/osc/osc_controllable.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/surfaces/osc/osc_controllable.cc b/libs/surfaces/osc/osc_controllable.cc
index 66e70c7e7a..9851daeb7e 100644
--- a/libs/surfaces/osc/osc_controllable.cc
+++ b/libs/surfaces/osc/osc_controllable.cc
@@ -30,7 +30,7 @@ using namespace sigc;
using namespace PBD;
using namespace ARDOUR;
-OSCControllable::OSCControllable (lo_address a, const string& p, boost::shared_ptr<Controllable> c)
+OSCControllable::OSCControllable (lo_address a, const std::string& p, boost::shared_ptr<Controllable> c)
: controllable (c)
, addr (a)
, path (p)
@@ -71,7 +71,7 @@ OSCControllable::send_change ()
/*------------------------------------------------------------*/
-OSCRouteControllable::OSCRouteControllable (lo_address a, const 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)
@@ -92,7 +92,7 @@ OSCRouteControllable::send_change ()
/* XXX thread issues */
- cerr << "ORC: send " << path << " = " << controllable->get_value() << endl;
+ std::cerr << "ORC: send " << path << " = " << controllable->get_value() << std::endl;
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
}