From e341132df82daa96dd276fe6b57aaae787fd084a Mon Sep 17 00:00:00 2001 From: Nick Mainsbridge Date: Wed, 13 May 2009 15:45:38 +0000 Subject: Compilation fixes from using namespace removal. git-svn-id: svn://localhost/ardour2/branches/3.0@5072 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/mix.cc | 12 ++++++------ libs/surfaces/mackie/mackie_jog_wheel.cc | 2 +- libs/surfaces/osc/osc_controllable.cc | 6 +++--- libs/surfaces/osc/osc_controllable.h | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/ardour/mix.cc b/libs/ardour/mix.cc index 1934d6075a..0bdbf7aa1b 100644 --- a/libs/ardour/mix.cc +++ b/libs/ardour/mix.cc @@ -33,7 +33,7 @@ float debug_compute_peak (ARDOUR::Sample *buf, nframes_t nsamples, float current) { if ( ((intptr_t)buf % 16) != 0) { - cerr << "compute_peak(): buffer unaligned!" << endl; + std::cerr << "compute_peak(): buffer unaligned!" << std::endl; } return x86_sse_compute_peak(buf, nsamples, current); @@ -43,7 +43,7 @@ void debug_apply_gain_to_buffer (ARDOUR::Sample *buf, nframes_t nframes, float gain) { if ( ((intptr_t)buf % 16) != 0) { - cerr << "apply_gain_to_buffer(): buffer unaligned!" << endl; + std::cerr << "apply_gain_to_buffer(): buffer unaligned!" << std::endl; } x86_sse_apply_gain_to_buffer(buf, nframes, gain); @@ -53,11 +53,11 @@ void debug_mix_buffers_with_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes, float gain) { if ( ((intptr_t)dst & 15) != 0) { - cerr << "mix_buffers_with_gain(): dst unaligned!" << endl; + std::cerr << "mix_buffers_with_gain(): dst unaligned!" << std::endl; } if ( ((intptr_t)dst & 15) != ((intptr_t)src & 15) ) { - cerr << "mix_buffers_with_gain(): dst & src don't have the same alignment!" << endl; + std::cerr << "mix_buffers_with_gain(): dst & src don't have the same alignment!" << std::endl; mix_buffers_with_gain(dst, src, nframes, gain); } else { x86_sse_mix_buffers_with_gain(dst, src, nframes, gain); @@ -68,11 +68,11 @@ void debug_mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes) { if ( ((intptr_t)dst & 15) != 0) { - cerr << "mix_buffers_no_gain(): dst unaligned!" << endl; + std::cerr << "mix_buffers_no_gain(): dst unaligned!" << std::endl; } if ( ((intptr_t)dst & 15) != ((intptr_t)src & 15) ) { - cerr << "mix_buffers_no_gain(): dst & src don't have the same alignment!" << endl; + std::cerr << "mix_buffers_no_gain(): dst & src don't have the same alignment!" << std::endl; mix_buffers_no_gain(dst, src, nframes); } else { x86_sse_mix_buffers_no_gain(dst, src, nframes); diff --git a/libs/surfaces/mackie/mackie_jog_wheel.cc b/libs/surfaces/mackie/mackie_jog_wheel.cc index d05eb23638..4e61fc55c9 100644 --- a/libs/surfaces/mackie/mackie_jog_wheel.cc +++ b/libs/surfaces/mackie/mackie_jog_wheel.cc @@ -101,7 +101,7 @@ void JogWheel::jog_event( SurfacePort & port, Control & control, const ControlSt break; case select: - cout << "JogWheel select not implemented" << endl; + std::cout << "JogWheel select not implemented" << std::endl; break; } } 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 c) +OSCControllable::OSCControllable (lo_address a, const std::string& p, boost::shared_ptr 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 c, boost::shared_ptr 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); } diff --git a/libs/surfaces/osc/osc_controllable.h b/libs/surfaces/osc/osc_controllable.h index 61261a8f1c..4b10dbc39e 100644 --- a/libs/surfaces/osc/osc_controllable.h +++ b/libs/surfaces/osc/osc_controllable.h @@ -38,7 +38,7 @@ class Route; class OSCControllable : public PBD::Stateful { public: - OSCControllable (lo_address addr, const string& path, boost::shared_ptr); + OSCControllable (lo_address addr, const std::string& path, boost::shared_ptr); virtual ~OSCControllable (); lo_address address() const { return addr; } @@ -49,7 +49,7 @@ class OSCControllable : public PBD::Stateful protected: boost::shared_ptr controllable; lo_address addr; - string path; + std::string path; virtual void send_change (); }; @@ -58,7 +58,7 @@ class OSCRouteControllable : public OSCControllable { public: - OSCRouteControllable (lo_address addr, const string& path, + OSCRouteControllable (lo_address addr, const std::string& path, boost::shared_ptr, boost::shared_ptr); ~OSCRouteControllable (); -- cgit v1.2.3