Skip to content

Commit 8a4a3bc

Browse files
committed
Removed usage of using namespace libmidi statement from samples to use absolute namespace.
1 parent c65e26c commit 8a4a3bc

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ This example creates the Nintendo's Mario Bros. 1-up sound in MIDI file format.
7070
```cpp
7171
int create_mario_1up()
7272
{
73-
MidiFile f;
73+
libmidi::MidiFile f;
7474

7575
f.setInstrument(0x51); // "Lead 2 (sawtooth)"
7676
f.setTempo(0x051615); // 333333 microseconds per quarter note
@@ -109,7 +109,7 @@ int play_random_piano()
109109
std::vector<std::string> piano_instruments;
110110
for(int8_t i=0; i<=127 && i >= 0; i++)
111111
{
112-
std::string name = getInstrumentName(i);
112+
std::string name = libmidi::getInstrumentName(i);
113113
if (name.find("Piano") != std::string::npos)
114114
piano_instruments.push_back(name);
115115
}
@@ -120,9 +120,9 @@ int play_random_piano()
120120
const char * selected_piano_instrument = piano_instruments[selection].c_str();
121121

122122
//create the melody
123-
MidiFile f;
123+
libmidi::MidiFile f;
124124

125-
f.setInstrument(findInstrument(selected_piano_instrument));
125+
f.setInstrument(libmidi::findInstrument(selected_piano_instrument));
126126
f.setTicksPerQuarterNote(0x80);
127127
f.addNote(NOTE_C4, 500); // 262 Hz
128128
f.addNote(NOTE_D4, 500); // 294 Hz

samples/samples.cpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,10 @@
3131
#include "rapidassist/random.h"
3232

3333
using namespace ra::random;
34-
using namespace libmidi;
3534

3635
int demo_create_mario_1up(int argc, char **argv)
3736
{
38-
MidiFile f;
37+
libmidi::MidiFile f;
3938

4039
f.setInstrument(0x51); // "Lead 2 (sawtooth)"
4140
f.setTempo(0x051615); // 333333 microseconds per quarter note
@@ -66,7 +65,7 @@ int demo_play_random_piano(int argc, char **argv)
6665
std::vector<std::string> piano_instruments;
6766
for(int8_t i=0; i<=127 && i >= 0; i++)
6867
{
69-
std::string name = getInstrumentName(i);
68+
std::string name = libmidi::getInstrumentName(i);
7069
if (name.find("Piano") != std::string::npos)
7170
piano_instruments.push_back(name);
7271
}
@@ -77,9 +76,9 @@ int demo_play_random_piano(int argc, char **argv)
7776
const char * selected_piano_instrument = piano_instruments[selection].c_str();
7877

7978
//create the melody
80-
MidiFile f;
79+
libmidi::MidiFile f;
8180

82-
f.setInstrument(findInstrument(selected_piano_instrument));
81+
f.setInstrument(libmidi::findInstrument(selected_piano_instrument));
8382
f.setTicksPerQuarterNote(0x80);
8483
f.addNote(NOTE_C4, 500); // 262 Hz
8584
f.addNote(NOTE_D4, 500); // 294 Hz

0 commit comments

Comments
 (0)