diff options
-rw-r--r-- | gtk2_ardour/edit_note_dialog.h | 4 | ||||
-rw-r--r-- | gtk2_ardour/midi_region_view.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/patch_change.h | 14 | ||||
-rw-r--r-- | gtk2_ardour/route_ui.cc | 1 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_diskstream.h | 4 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_track.h | 2 | ||||
-rw-r--r-- | libs/ardour/butler.cc | 2 | ||||
-rw-r--r-- | libs/ardour/port_manager.cc | 2 | ||||
-rw-r--r-- | libs/ardour/smf_source.cc | 1 |
10 files changed, 18 insertions, 14 deletions
diff --git a/gtk2_ardour/edit_note_dialog.h b/gtk2_ardour/edit_note_dialog.h index 59e53722a0..bc8d546057 100644 --- a/gtk2_ardour/edit_note_dialog.h +++ b/gtk2_ardour/edit_note_dialog.h @@ -28,9 +28,9 @@ class NoteBase; class EditNoteDialog : public ArdourDialog { public: - EditNoteDialog (MidiRegionView* rv, set<NoteBase*> n); + EditNoteDialog (MidiRegionView* rv, std::set<NoteBase*> n); - void done (int); + void done (int); private: MidiRegionView* _region_view; diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 21ae56b8c2..1accb0c6b5 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -85,6 +85,7 @@ using namespace ARDOUR; using namespace PBD; using namespace Editing; +using namespace std; using Gtkmm2ext::Keyboard; PBD::Signal1<void, MidiRegionView *> MidiRegionView::SelectionCleared; diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index c3e42a0968..f51746c1ec 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -97,6 +97,7 @@ using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; using namespace Editing; +using namespace std; // Minimum height at which a control is displayed static const uint32_t MIDI_CONTROLS_BOX_MIN_HEIGHT = 160; diff --git a/gtk2_ardour/patch_change.h b/gtk2_ardour/patch_change.h index 44f10074d5..a087c2a090 100644 --- a/gtk2_ardour/patch_change.h +++ b/gtk2_ardour/patch_change.h @@ -34,13 +34,13 @@ class PatchChange { public: PatchChange( - MidiRegionView& region, - ArdourCanvas::Container* parent, - const string& text, - double height, - double x, - double y, - ARDOUR::InstrumentInfo& info, + MidiRegionView& region, + ArdourCanvas::Container* parent, + const std::string& text, + double height, + double x, + double y, + ARDOUR::InstrumentInfo& info, ARDOUR::MidiModel::PatchChangePtr patch ); diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index dcdf7fa778..2d353eb6b1 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -63,6 +63,7 @@ using namespace Gtkmm2ext; using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; using namespace PBD; +using namespace std; uint32_t RouteUI::_max_invert_buttons = 3; PBD::Signal1<void, boost::shared_ptr<Route> > RouteUI::BusSendDisplayChanged; diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h index 91fb891f17..70b4454118 100644 --- a/libs/ardour/ardour/midi_diskstream.h +++ b/libs/ardour/ardour/midi_diskstream.h @@ -55,7 +55,7 @@ class Session; class LIBARDOUR_API MidiDiskstream : public Diskstream { public: - MidiDiskstream (Session &, const string& name, Diskstream::Flag f = Recordable); + MidiDiskstream (Session &, const std::string& name, Diskstream::Flag f = Recordable); MidiDiskstream (Session &, const XMLNode&); ~MidiDiskstream(); @@ -147,7 +147,7 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream int use_new_write_source (uint32_t n=0); - int find_and_use_playlist (const string&); + int find_and_use_playlist (const std::string&); void allocate_temporary_buffers (); diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index 3db16937fc..dbfd18c090 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -38,7 +38,7 @@ class Session; class LIBARDOUR_API MidiTrack : public Track { public: - MidiTrack (Session&, string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal); + MidiTrack (Session&, std::string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal); ~MidiTrack (); int init (); diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc index 9bc232007b..8ea3cb4624 100644 --- a/libs/ardour/butler.cc +++ b/libs/ardour/butler.cc @@ -466,7 +466,7 @@ Butler::empty_pool_trash () void Butler::drop_references () { - cerr << "Butler drops pool trash\n"; + std::cerr << "Butler drops pool trash\n"; SessionEvent::pool->set_trash (0); } diff --git a/libs/ardour/port_manager.cc b/libs/ardour/port_manager.cc index c7adefc531..a8d8da0067 100644 --- a/libs/ardour/port_manager.cc +++ b/libs/ardour/port_manager.cc @@ -451,7 +451,7 @@ PortManager::reestablish_ports () for (i = p->begin(); i != p->end(); ++i) { if (i->second->reestablish ()) { error << string_compose (_("Re-establising port %1 failed"), i->second->name()) << endmsg; - cerr << string_compose (_("Re-establising port %1 failed"), i->second->name()) << endl; + std::cerr << string_compose (_("Re-establising port %1 failed"), i->second->name()) << std::endl; break; } } diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index 1ffcdac1b2..72f03ba351 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -51,6 +51,7 @@ using namespace ARDOUR; using namespace Glib; using namespace PBD; using namespace Evoral; +using namespace std; /** Constructor used for new internal-to-session files. File cannot exist. */ SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags) |