Skip to content

Commit 6cea6b7

Browse files
kunitokikunitoki
authored
Merge branch 'main' into dev/midi2_linux
2 parents a8f35e0 + ddf9b84 commit 6cea6b7

25 files changed

+329
-144
lines changed

‎modules/yup_audio_devices/yup_audio_devices.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,13 @@
6464

6565
#include "audio_io/yup_SampleRateHelpers.cpp"
6666
#include "midi_io/yup_MidiDevices.cpp"
67+
#include "midi_io/ump/yup_UMPBytestreamInputHandler.h"
68+
#include "midi_io/ump/yup_UMPU32InputHandler.h"
6769

6870
//==============================================================================
6971
#if YUP_MAC || YUP_IOS
7072
#include <yup_audio_basics/native/yup_CoreAudioTimeConversions_apple.h>
7173
#include <yup_audio_basics/native/yup_AudioWorkgroup_apple.h>
72-
73-
#include "midi_io/ump/yup_UMPBytestreamInputHandler.h"
74-
#include "midi_io/ump/yup_UMPU32InputHandler.h"
7574
#endif
7675

7776
#if YUP_MAC

‎tests/CMakeLists.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,13 @@ yup_standalone_app (
124124
# ==== Setup sources
125125
set (sources "")
126126
foreach (module ${target_modules})
127-
file (GLOB_RECURSE module_sources
128-
"${CMAKE_CURRENT_LIST_DIR}/${module}/*.hpp"
129-
"${CMAKE_CURRENT_LIST_DIR}/${module}/*.cpp")
127+
file (GLOB module_sources
128+
"${CMAKE_CURRENT_LIST_DIR}/${module}.cpp")
130129
list (APPEND sources ${module_sources})
131130

132131
if (YUP_PLATFORM_APPLE)
133132
file (GLOB_RECURSE apple_sources
134-
"${CMAKE_CURRENT_LIST_DIR}/${module}/*.mm")
133+
"${CMAKE_CURRENT_LIST_DIR}/${module}.mm")
135134
list (APPEND sources ${apple_sources})
136135
endif()
137136
endforeach()

‎tests/yup_audio_basics.cpp‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
#include "yup_audio_basics/yup_ADSR.cpp"
2+
#include "yup_audio_basics/yup_AudioChannelSet.cpp"
3+
#include "yup_audio_basics/yup_AudioDataConverters.cpp"
4+
#include "yup_audio_basics/yup_AudioPlayHead.cpp"
5+
#include "yup_audio_basics/yup_AudioProcessLoadMeasurer.cpp"
6+
#include "yup_audio_basics/yup_AudioSampleBuffer.cpp"
7+
#include "yup_audio_basics/yup_BufferingAudioSource.cpp"
8+
#include "yup_audio_basics/yup_ChannelRemappingAudioSource.cpp"
9+
#include "yup_audio_basics/yup_Decibels.cpp"
10+
#include "yup_audio_basics/yup_FloatVectorOperations.cpp"
11+
#include "yup_audio_basics/yup_IIRFilter.cpp"
12+
#include "yup_audio_basics/yup_Interpolators.cpp"
13+
#include "yup_audio_basics/yup_MemoryAudioSource.cpp"
14+
#include "yup_audio_basics/yup_MidiBuffer.cpp"
15+
#include "yup_audio_basics/yup_MidiDataConcatenator.cpp"
16+
#include "yup_audio_basics/yup_MidiFile.cpp"
17+
#include "yup_audio_basics/yup_MidiKeyboardState.cpp"
18+
#include "yup_audio_basics/yup_MidiMessage.cpp"
19+
#include "yup_audio_basics/yup_MidiMessageSequence.cpp"
20+
#include "yup_audio_basics/yup_MidiRPN.cpp"
21+
#include "yup_audio_basics/yup_MixerAudioSource.cpp"
22+
#include "yup_audio_basics/yup_MPEInstrument.cpp"
23+
#include "yup_audio_basics/yup_MPEMessages.cpp"
24+
#include "yup_audio_basics/yup_MPENote.cpp"
25+
#include "yup_audio_basics/yup_MPESynthesiserBase.cpp"
26+
#include "yup_audio_basics/yup_MPEUtils.cpp"
27+
#include "yup_audio_basics/yup_MPEValue.cpp"
28+
#include "yup_audio_basics/yup_MPEZoneLayout.cpp"
29+
#include "yup_audio_basics/yup_ResamplingAudioSource.cpp"
30+
#include "yup_audio_basics/yup_Reverb.cpp"
31+
#include "yup_audio_basics/yup_ReverbAudioSource.cpp"
32+
#include "yup_audio_basics/yup_SmoothedValue.cpp"
33+
#include "yup_audio_basics/yup_Synthesiser.cpp"
34+
#include "yup_audio_basics/yup_ToneGeneratorAudioSource.cpp"
35+
#include "yup_audio_basics/yup_UMP.cpp"
36+
#include "yup_audio_basics/yup_UMPCapabilityInquiry.cpp"
37+
#include "yup_audio_basics/yup_UMPChannelVoice.cpp"
38+
#include "yup_audio_basics/yup_UMPDataMessages.cpp"
39+
#include "yup_audio_basics/yup_UMPExtendedDataMessages.cpp"
40+
#include "yup_audio_basics/yup_UMPFlexDataMessages.cpp"
41+
#include "yup_audio_basics/yup_UMPJitterReductionTimestamps.cpp"
42+
#include "yup_audio_basics/yup_UMPKeyboardState.cpp"
43+
#include "yup_audio_basics/yup_UMPMessages.cpp"
44+
#include "yup_audio_basics/yup_UMPMidi1ByteStream.cpp"
45+
#include "yup_audio_basics/yup_UMPMidi1ChannelVoiceMessage.cpp"
46+
#include "yup_audio_basics/yup_UMPMidi2ChannelVoiceMessage.cpp"
47+
#include "yup_audio_basics/yup_UMPPacketBuffer.cpp"
48+
#include "yup_audio_basics/yup_UMPStreamMessages.cpp"
49+
#include "yup_audio_basics/yup_UMPSysExCollectors.cpp"
50+
#include "yup_audio_basics/yup_UMPTypes.cpp"
51+
#include "yup_audio_basics/yup_UMPUniversalPacket.cpp"
52+
#include "yup_audio_basics/yup_UMPUniversalSysEx.cpp"

‎tests/yup_audio_basics/yup_MixerAudioSource.cpp‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ using namespace yup;
2828
//==============================================================================
2929
namespace
3030
{
31-
class MockAudioSource : public AudioSource
31+
class MockMixerAudioSource : public AudioSource
3232
{
3333
public:
34-
MockAudioSource() = default;
35-
~MockAudioSource() override = default;
34+
MockMixerAudioSource() = default;
35+
~MockMixerAudioSource() override = default;
3636

3737
void prepareToPlay (int samplesPerBlockExpected, double sampleRate) override
3838
{
@@ -95,7 +95,7 @@ TEST_F (MixerAudioSourceTests, Constructor)
9595
TEST_F (MixerAudioSourceTests, Destructor)
9696
{
9797
auto* temp = new MixerAudioSource();
98-
auto* source = new MockAudioSource();
98+
auto* source = new MockMixerAudioSource();
9999
temp->addInputSource (source, true);
100100

101101
// Destructor should call removeAllInputs which releases resources
@@ -111,7 +111,7 @@ TEST_F (MixerAudioSourceTests, AddInputSourceWithNull)
111111

112112
TEST_F (MixerAudioSourceTests, AddInputSourceWithoutDelete)
113113
{
114-
MockAudioSource source;
114+
MockMixerAudioSource source;
115115
mixer->addInputSource (&source, false);
116116

117117
// Source should not be prepared if mixer hasn't been prepared yet (line 68)
@@ -122,7 +122,7 @@ TEST_F (MixerAudioSourceTests, AddInputSourceAfterPrepare)
122122
{
123123
mixer->prepareToPlay (512, 44100.0);
124124

125-
MockAudioSource source;
125+
MockMixerAudioSource source;
126126
mixer->addInputSource (&source, false);
127127

128128
// Source should be prepared if mixer was already prepared (line 68-69)
@@ -133,15 +133,15 @@ TEST_F (MixerAudioSourceTests, AddInputSourceAfterPrepare)
133133

134134
TEST_F (MixerAudioSourceTests, AddInputSourceWithDelete)
135135
{
136-
auto* source = new MockAudioSource();
136+
auto* source = new MockMixerAudioSource();
137137
mixer->addInputSource (source, true);
138138

139139
// Cleanup will happen in mixer destructor or removeInputSource
140140
}
141141

142142
TEST_F (MixerAudioSourceTests, AddDuplicateInput)
143143
{
144-
MockAudioSource source;
144+
MockMixerAudioSource source;
145145
mixer->addInputSource (&source, false);
146146

147147
// Adding same source again should be ignored (line 57)
@@ -157,15 +157,15 @@ TEST_F (MixerAudioSourceTests, RemoveInputSourceWithNull)
157157

158158
TEST_F (MixerAudioSourceTests, RemoveNonExistentInput)
159159
{
160-
MockAudioSource source;
160+
MockMixerAudioSource source;
161161
// Should return early if input not found (line 88-89)
162162
EXPECT_NO_THROW (mixer->removeInputSource (&source));
163163
EXPECT_FALSE (source.releaseResourcesCalled);
164164
}
165165

166166
TEST_F (MixerAudioSourceTests, RemoveInputSourceWithoutDelete)
167167
{
168-
MockAudioSource source;
168+
MockMixerAudioSource source;
169169
mixer->addInputSource (&source, false);
170170
mixer->removeInputSource (&source);
171171

@@ -175,7 +175,7 @@ TEST_F (MixerAudioSourceTests, RemoveInputSourceWithoutDelete)
175175

176176
TEST_F (MixerAudioSourceTests, RemoveInputSourceWithDelete)
177177
{
178-
auto* source = new MockAudioSource();
178+
auto* source = new MockMixerAudioSource();
179179
mixer->addInputSource (source, true);
180180

181181
// Should delete the source (line 91-92)
@@ -192,8 +192,8 @@ TEST_F (MixerAudioSourceTests, RemoveAllInputsEmpty)
192192

193193
TEST_F (MixerAudioSourceTests, RemoveAllInputsWithoutDelete)
194194
{
195-
MockAudioSource source1;
196-
MockAudioSource source2;
195+
MockMixerAudioSource source1;
196+
MockMixerAudioSource source2;
197197

198198
mixer->addInputSource (&source1, false);
199199
mixer->addInputSource (&source2, false);
@@ -208,8 +208,8 @@ TEST_F (MixerAudioSourceTests, RemoveAllInputsWithoutDelete)
208208

209209
TEST_F (MixerAudioSourceTests, RemoveAllInputsWithDelete)
210210
{
211-
auto* source1 = new MockAudioSource();
212-
auto* source2 = new MockAudioSource();
211+
auto* source1 = new MockMixerAudioSource();
212+
auto* source2 = new MockMixerAudioSource();
213213

214214
mixer->addInputSource (source1, true);
215215
mixer->addInputSource (source2, true);
@@ -220,8 +220,8 @@ TEST_F (MixerAudioSourceTests, RemoveAllInputsWithDelete)
220220

221221
TEST_F (MixerAudioSourceTests, RemoveAllInputsMixed)
222222
{
223-
MockAudioSource source1;
224-
auto* source2 = new MockAudioSource();
223+
MockMixerAudioSource source1;
224+
auto* source2 = new MockMixerAudioSource();
225225

226226
mixer->addInputSource (&source1, false);
227227
mixer->addInputSource (source2, true);
@@ -235,8 +235,8 @@ TEST_F (MixerAudioSourceTests, RemoveAllInputsMixed)
235235
//==============================================================================
236236
TEST_F (MixerAudioSourceTests, PrepareToPlay)
237237
{
238-
MockAudioSource source1;
239-
MockAudioSource source2;
238+
MockMixerAudioSource source1;
239+
MockMixerAudioSource source2;
240240

241241
mixer->addInputSource (&source1, false);
242242
mixer->addInputSource (&source2, false);
@@ -253,8 +253,8 @@ TEST_F (MixerAudioSourceTests, PrepareToPlay)
253253
//==============================================================================
254254
TEST_F (MixerAudioSourceTests, ReleaseResources)
255255
{
256-
MockAudioSource source1;
257-
MockAudioSource source2;
256+
MockMixerAudioSource source1;
257+
MockMixerAudioSource source2;
258258

259259
mixer->addInputSource (&source1, false);
260260
mixer->addInputSource (&source2, false);
@@ -301,7 +301,7 @@ TEST_F (MixerAudioSourceTests, GetNextAudioBlockWithNoInputs)
301301

302302
TEST_F (MixerAudioSourceTests, GetNextAudioBlockWithSingleInput)
303303
{
304-
MockAudioSource source;
304+
MockMixerAudioSource source;
305305
source.fillValue = 0.3f;
306306

307307
mixer->addInputSource (&source, false);
@@ -332,9 +332,9 @@ TEST_F (MixerAudioSourceTests, GetNextAudioBlockWithSingleInput)
332332

333333
TEST_F (MixerAudioSourceTests, GetNextAudioBlockWithMultipleInputs)
334334
{
335-
MockAudioSource source1;
336-
MockAudioSource source2;
337-
MockAudioSource source3;
335+
MockMixerAudioSource source1;
336+
MockMixerAudioSource source2;
337+
MockMixerAudioSource source3;
338338

339339
source1.fillValue = 0.2f;
340340
source2.fillValue = 0.3f;
@@ -374,7 +374,7 @@ TEST_F (MixerAudioSourceTests, GetNextAudioBlockWithMultipleInputs)
374374

375375
TEST_F (MixerAudioSourceTests, GetNextAudioBlockWithStartSampleOffset)
376376
{
377-
MockAudioSource source;
377+
MockMixerAudioSource source;
378378
source.fillValue = 0.5f;
379379

380380
mixer->addInputSource (&source, false);
@@ -411,8 +411,8 @@ TEST_F (MixerAudioSourceTests, GetNextAudioBlockWithStartSampleOffset)
411411

412412
TEST_F (MixerAudioSourceTests, GetNextAudioBlockResizesTempBuffer)
413413
{
414-
MockAudioSource source1;
415-
MockAudioSource source2;
414+
MockMixerAudioSource source1;
415+
MockMixerAudioSource source2;
416416

417417
source1.fillValue = 0.3f;
418418
source2.fillValue = 0.4f;

‎tests/yup_audio_basics/yup_ResamplingAudioSource.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ using namespace yup;
2828
//==============================================================================
2929
namespace
3030
{
31-
class MockAudioSource : public AudioSource
31+
class MockResamplingAudioSource : public AudioSource
3232
{
3333
public:
34-
MockAudioSource() = default;
35-
~MockAudioSource() override = default;
34+
MockResamplingAudioSource() = default;
35+
~MockResamplingAudioSource() override = default;
3636

3737
void prepareToPlay (int samplesPerBlockExpected, double sampleRate) override
3838
{
@@ -75,7 +75,7 @@ class ResamplingAudioSourceTests : public ::testing::Test
7575
protected:
7676
void SetUp() override
7777
{
78-
mockSource = new MockAudioSource();
78+
mockSource = new MockResamplingAudioSource();
7979
resampler = std::make_unique<ResamplingAudioSource> (mockSource, true, 2);
8080
}
8181

@@ -84,26 +84,26 @@ class ResamplingAudioSourceTests : public ::testing::Test
8484
resampler.reset();
8585
}
8686

87-
MockAudioSource* mockSource; // Owned by resampler
87+
MockResamplingAudioSource* mockSource; // Owned by resampler
8888
std::unique_ptr<ResamplingAudioSource> resampler;
8989
};
9090

9191
//==============================================================================
9292
TEST_F (ResamplingAudioSourceTests, Constructor)
9393
{
94-
auto* source = new MockAudioSource();
94+
auto* source = new MockResamplingAudioSource();
9595
EXPECT_NO_THROW (ResamplingAudioSource (source, true, 2));
9696
}
9797

9898
TEST_F (ResamplingAudioSourceTests, ConstructorWithDifferentChannels)
9999
{
100-
auto* source = new MockAudioSource();
100+
auto* source = new MockResamplingAudioSource();
101101
EXPECT_NO_THROW (ResamplingAudioSource (source, true, 8));
102102
}
103103

104104
TEST_F (ResamplingAudioSourceTests, Destructor)
105105
{
106-
auto* source = new MockAudioSource();
106+
auto* source = new MockResamplingAudioSource();
107107
auto* temp = new ResamplingAudioSource (source, true, 2);
108108
EXPECT_NO_THROW (delete temp);
109109
}
@@ -308,7 +308,7 @@ TEST_F (ResamplingAudioSourceTests, GetNextAudioBlockBufferResize)
308308

309309
TEST_F (ResamplingAudioSourceTests, GetNextAudioBlockMultipleChannels)
310310
{
311-
auto* source = new MockAudioSource();
311+
auto* source = new MockResamplingAudioSource();
312312
auto multiChannelResampler = std::make_unique<ResamplingAudioSource> (source, true, 8);
313313

314314
multiChannelResampler->setResamplingRatio (1.0);

‎tests/yup_audio_basics/yup_ReverbAudioSource.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ using namespace yup;
2828
//==============================================================================
2929
namespace
3030
{
31-
class MockAudioSource : public AudioSource
31+
class MockReverbAudioSource : public AudioSource
3232
{
3333
public:
34-
MockAudioSource() = default;
35-
~MockAudioSource() override = default;
34+
MockReverbAudioSource() = default;
35+
~MockReverbAudioSource() override = default;
3636

3737
void prepareToPlay (int samplesPerBlockExpected, double sampleRate) override
3838
{
@@ -75,7 +75,7 @@ class ReverbAudioSourceTests : public ::testing::Test
7575
protected:
7676
void SetUp() override
7777
{
78-
mockSource = new MockAudioSource();
78+
mockSource = new MockReverbAudioSource();
7979
reverbSource = std::make_unique<ReverbAudioSource> (mockSource, true);
8080
}
8181

@@ -84,26 +84,26 @@ class ReverbAudioSourceTests : public ::testing::Test
8484
reverbSource.reset();
8585
}
8686

87-
MockAudioSource* mockSource; // Owned by reverbSource
87+
MockReverbAudioSource* mockSource; // Owned by reverbSource
8888
std::unique_ptr<ReverbAudioSource> reverbSource;
8989
};
9090

9191
//==============================================================================
9292
TEST_F (ReverbAudioSourceTests, ConstructorWithDeleteInput)
9393
{
94-
auto* source = new MockAudioSource();
94+
auto* source = new MockReverbAudioSource();
9595
EXPECT_NO_THROW (ReverbAudioSource (source, true));
9696
}
9797

9898
TEST_F (ReverbAudioSourceTests, ConstructorWithoutDeleteInput)
9999
{
100-
MockAudioSource source;
100+
MockReverbAudioSource source;
101101
EXPECT_NO_THROW (ReverbAudioSource (&source, false));
102102
}
103103

104104
TEST_F (ReverbAudioSourceTests, Destructor)
105105
{
106-
auto* source = new MockAudioSource();
106+
auto* source = new MockReverbAudioSource();
107107
auto* temp = new ReverbAudioSource (source, true);
108108
EXPECT_NO_THROW (delete temp);
109109
}

‎tests/yup_audio_devices.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#include "yup_audio_devices/yup_AudioDeviceManager.cpp"
2+
#include "yup_audio_devices/yup_UMPPacketCollector.cpp"

‎tests/yup_audio_formats.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#include "yup_audio_formats/yup_AudioFormatManager.cpp"
2+
#include "yup_audio_formats/yup_WaveAudioFormat.cpp"

0 commit comments

Comments
 (0)