Skip to content

Commit 5d42f83

Browse files
refactor: fully qualify juce namespace across header-files and specify using namespace in cpp-files
1 parent 01951a0 commit 5d42f83

32 files changed

Lines changed: 110 additions & 83 deletions

include/element/application.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class Application : public juce::JUCEApplication,
143143
Context& context;
144144
juce::MidiDeviceListConnection connection;
145145
juce::WeakReference<MidiSettingsApply>::Master masterReference;
146-
friend class WeakReference<MidiSettingsApply>;
146+
friend class juce::WeakReference<MidiSettingsApply>;
147147
};
148148
std::unique_ptr<MidiSettingsApply> applyMidiSettings;
149149
#endif

include/element/juce.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@
2121
#include <juce_gui_extra/juce_gui_extra.h>
2222
#include <juce_osc/juce_osc.h>
2323

24-
using namespace juce; // FIXME: namespace juce
2524
namespace element {
2625
}

include/element/ui/standard.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class StandardContent : public Content,
9191
std::unique_ptr<NavigationConcertinaPanel> nav;
9292
friend class ContentContainer;
9393
std::unique_ptr<ContentContainer> container;
94-
StretchableLayoutManager layout;
94+
juce::StretchableLayoutManager layout;
9595
class Resizer;
9696
friend class Resizer;
9797
std::unique_ptr<Resizer> bar1;

src/application.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
#define ELEMENT_FIRST_RUN 0
3737
#endif
3838

39+
using namespace juce;
40+
3941
namespace element {
4042

4143
static std::atomic<int> sCanShutdown { 0 };

src/engine/mappingengine.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class MappingEngine
3333
void stopMapping();
3434

3535
void capture (const bool start = true) { capturedEvent.capture.set (start); }
36-
MidiMessage getCapturedMidiMessage() const { return capturedEvent.message; }
36+
juce::MidiMessage getCapturedMidiMessage() const { return capturedEvent.message; }
3737
Control getCapturedControl() const { return capturedEvent.control; }
3838
CapturedEventSignal& capturedSignal() { return capturedEvent.callback; }
3939

@@ -42,7 +42,7 @@ class MappingEngine
4242
class Inputs;
4343
std::unique_ptr<Inputs> inputs;
4444

45-
class CapturedEvent : public AsyncUpdater
45+
class CapturedEvent : public juce::AsyncUpdater
4646
{
4747
public:
4848
CapturedEvent() { capture.set (false); }
@@ -55,13 +55,13 @@ class MappingEngine
5555

5656
private:
5757
friend class MappingEngine;
58-
Atomic<bool> capture;
58+
juce::Atomic<bool> capture;
5959
Control control;
60-
MidiMessage message;
60+
juce::MidiMessage message;
6161
CapturedEventSignal callback;
6262
} capturedEvent;
6363

64-
bool captureNextEvent (ControllerMapInput&, const Control&, const MidiMessage&);
64+
bool captureNextEvent (ControllerMapInput&, const Control&, const juce::MidiMessage&);
6565
};
6666

6767
} // namespace element

src/engine/midipanic.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class MidiPanic
2525
/** Write panic messags to a buffer. */
2626
inline static void write (juce::MidiBuffer& buffer, int ch, int frame)
2727
{
28-
buffer.addEvent (MidiMessage::allNotesOff (ch), frame);
29-
buffer.addEvent (MidiMessage::allSoundOff (ch), frame);
28+
buffer.addEvent (juce::MidiMessage::allNotesOff (ch), frame);
29+
buffer.addEvent (juce::MidiMessage::allSoundOff (ch), frame);
3030
}
3131

3232
/** Write panic messages on all midi channels in the buffer. */
@@ -47,11 +47,11 @@ class MidiPanic
4747
inline static std::vector<juce::MidiMessage> messages (int ch)
4848
{
4949
std::vector<juce::MidiMessage> msgs;
50-
const auto timestamp = Time::getMillisecondCounterHiRes();
51-
auto msg = MidiMessage::allNotesOff (ch);
50+
const auto timestamp = juce::Time::getMillisecondCounterHiRes();
51+
auto msg = juce::MidiMessage::allNotesOff (ch);
5252
msg.setTimeStamp (timestamp);
5353
msgs.push_back (msg);
54-
msg = MidiMessage::allSoundOff (ch);
54+
msg = juce::MidiMessage::allSoundOff (ch);
5555
msg.setTimeStamp (timestamp);
5656
msgs.push_back (msg);
5757
return msgs;
@@ -61,13 +61,13 @@ class MidiPanic
6161
inline static std::vector<juce::MidiMessage> messages()
6262
{
6363
std::vector<juce::MidiMessage> msgs;
64-
const auto timestamp = Time::getMillisecondCounterHiRes();
64+
const auto timestamp = juce::Time::getMillisecondCounterHiRes();
6565
for (int ch = 1; ch <= 16; ++ch)
6666
{
67-
auto msg = MidiMessage::allNotesOff (ch);
67+
auto msg = juce::MidiMessage::allNotesOff (ch);
6868
msg.setTimeStamp (timestamp);
6969
msgs.push_back (msg);
70-
msg = MidiMessage::allSoundOff (ch);
70+
msg = juce::MidiMessage::allSoundOff (ch);
7171
msg.setTimeStamp (timestamp);
7272
msgs.push_back (msg);
7373
}

src/engine/midipipe.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "el/midi_buffer.hpp"
1414
#include "el/factories.hpp"
1515

16+
using namespace juce;
1617
namespace element {
1718

1819
MidiPipe::MidiPipe()

src/engine/miditranspose.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,26 @@ class MidiTranspose
2727
inline int getNoteOffset() const { return offset.get(); }
2828

2929
/** Process a single event */
30-
inline static void process (MidiMessage& message, const int offset)
30+
inline static void process (juce::MidiMessage& message, const int offset)
3131
{
3232
if (message.isNoteOnOrOff())
3333
message.setNoteNumber (offset + message.getNoteNumber());
3434
}
3535

3636
/** Process a single event */
37-
inline void process (MidiMessage& message) noexcept
37+
inline void process (juce::MidiMessage& message) noexcept
3838
{
3939
if (message.isNoteOnOrOff())
4040
message.setNoteNumber (offset.get() + message.getNoteNumber());
4141
}
4242

4343
/** Process a MidiBuffer */
44-
inline void process (MidiBuffer& midi, int numSamples)
44+
inline void process (juce::MidiBuffer& midi, int numSamples)
4545
{
4646
if (0 == offset.get())
4747
return;
4848

49-
MidiMessage msg;
49+
juce::MidiMessage msg;
5050
for (auto m : midi)
5151
{
5252
if (m.samplePosition >= numSamples)
@@ -62,8 +62,8 @@ class MidiTranspose
6262
}
6363

6464
private:
65-
Atomic<int> offset { 0 };
66-
MidiBuffer output;
65+
juce::Atomic<int> offset { 0 };
66+
juce::MidiBuffer output;
6767
};
6868

6969
} // namespace element

src/nodes/audiofileplayer.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
#include "utils.hpp"
1919

20+
using namespace juce;
21+
2022
namespace element {
2123

2224
class AudioFilePlayerEditor;

src/nodes/audiofileplayer.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
namespace element {
1010

1111
class AudioFilePlayerNode : public BaseProcessor,
12-
public AudioProcessorParameter::Listener,
13-
public AsyncUpdater
12+
public juce::AudioProcessorParameter::Listener,
13+
public juce::AsyncUpdater
1414
{
1515
public:
1616
enum Parameters

0 commit comments

Comments
 (0)