smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-19 13:16:27 +01:00
Code Issues Projects Releases Wiki Activity

Add missing namespace qualifiers.

Browse source
This commit is contained in:
David Robillard 2014-11-30 18:27:04 -05:00
parent 008bfceb77
commit cf537b97f5
10 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/edit_note_dialog.h
View file

@ -28,9 +28,9 @@ class NoteBase;
class EditNoteDialog : public ArdourDialog class EditNoteDialog : public ArdourDialog
{ {
public: public:
EditNoteDialog (MidiRegionView* rv, set<NoteBase*> n); EditNoteDialog (MidiRegionView* rv, std::set<NoteBase*> n);
void done (int); void done (int);
private: private:
MidiRegionView* _region_view; MidiRegionView* _region_view;

1
gtk2_ardour/midi_region_view.cc
View file

@ -85,6 +85,7 @@
using namespace ARDOUR; using namespace ARDOUR;
using namespace PBD; using namespace PBD;
using namespace Editing; using namespace Editing;
using namespace std;
using Gtkmm2ext::Keyboard; using Gtkmm2ext::Keyboard;
PBD::Signal1<void, MidiRegionView *> MidiRegionView::SelectionCleared; PBD::Signal1<void, MidiRegionView *> MidiRegionView::SelectionCleared;

1
gtk2_ardour/midi_time_axis.cc
View file

@ -97,6 +97,7 @@ using namespace PBD;
using namespace Gtk; using namespace Gtk;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
using namespace Editing; using namespace Editing;
using namespace std;
// Minimum height at which a control is displayed // Minimum height at which a control is displayed
static const uint32_t MIDI_CONTROLS_BOX_MIN_HEIGHT = 160; static const uint32_t MIDI_CONTROLS_BOX_MIN_HEIGHT = 160;

14
gtk2_ardour/patch_change.h
View file

@ -34,13 +34,13 @@ class PatchChange
{ {
public: public:
PatchChange( PatchChange(
MidiRegionView& region, MidiRegionView& region,
ArdourCanvas::Container* parent, ArdourCanvas::Container* parent,
const string& text, const std::string& text,
double height, double height,
double x, double x,
double y, double y,
ARDOUR::InstrumentInfo& info, ARDOUR::InstrumentInfo& info,
ARDOUR::MidiModel::PatchChangePtr patch ARDOUR::MidiModel::PatchChangePtr patch
); );

1
gtk2_ardour/route_ui.cc
View file

@ -63,6 +63,7 @@ using namespace Gtkmm2ext;
using namespace ARDOUR; using namespace ARDOUR;
using namespace ARDOUR_UI_UTILS; using namespace ARDOUR_UI_UTILS;
using namespace PBD; using namespace PBD;
using namespace std;
uint32_t RouteUI::_max_invert_buttons = 3; uint32_t RouteUI::_max_invert_buttons = 3;
PBD::Signal1<void, boost::shared_ptr<Route> > RouteUI::BusSendDisplayChanged; PBD::Signal1<void, boost::shared_ptr<Route> > RouteUI::BusSendDisplayChanged;

4
libs/ardour/ardour/midi_diskstream.h
View file

@ -55,7 +55,7 @@ class Session;
class LIBARDOUR_API MidiDiskstream : public Diskstream class LIBARDOUR_API MidiDiskstream : public Diskstream
{ {
public: 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 (Session &, const XMLNode&);
~MidiDiskstream(); ~MidiDiskstream();
@ -147,7 +147,7 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
int use_new_write_source (uint32_t n=0); 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 (); void allocate_temporary_buffers ();

2
libs/ardour/ardour/midi_track.h
View file

@ -38,7 +38,7 @@ class Session;
class LIBARDOUR_API MidiTrack : public Track class LIBARDOUR_API MidiTrack : public Track
{ {
public: 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 (); ~MidiTrack ();
int init (); int init ();

2
libs/ardour/butler.cc
View file

@ -466,7 +466,7 @@ Butler::empty_pool_trash ()
void void
Butler::drop_references () Butler::drop_references ()
{ {
cerr << "Butler drops pool trash\n"; std::cerr << "Butler drops pool trash\n";
SessionEvent::pool->set_trash (0); SessionEvent::pool->set_trash (0);
} }

2
libs/ardour/port_manager.cc
View file

@ -451,7 +451,7 @@ PortManager::reestablish_ports ()
for (i = p->begin(); i != p->end(); ++i) { for (i = p->begin(); i != p->end(); ++i) {
if (i->second->reestablish ()) { if (i->second->reestablish ()) {
error << string_compose (_("Re-establising port %1 failed"), i->second->name()) << endmsg; 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; break;
} }
} }

1
libs/ardour/smf_source.cc
View file

@ -51,6 +51,7 @@ using namespace ARDOUR;
using namespace Glib; using namespace Glib;
using namespace PBD; using namespace PBD;
using namespace Evoral; using namespace Evoral;
using namespace std;
/** Constructor used for new internal-to-session files. File cannot exist. */ /** Constructor used for new internal-to-session files. File cannot exist. */
SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags) SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags)