mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-10 23:44:24 +00:00
Moved a couple of midi files around. DrawableImage::hitTest tweak.
This commit is contained in:
Julian Storer
parent
0e4a0df2c2
commit
85aeeea1e9
25 changed files with 239 additions and 240 deletions
|
|
@ -69,7 +69,6 @@ OBJECTS := \
|
|||
$(OBJDIR)/juce_AudioDeviceManager_c24db832.o \
|
||||
$(OBJDIR)/juce_AudioIODevice_f7da876b.o \
|
||||
$(OBJDIR)/juce_AudioIODeviceType_e5d402c5.o \
|
||||
$(OBJDIR)/juce_MidiOutput_f6dc5af3.o \
|
||||
$(OBJDIR)/juce_AudioDataConverters_dc0ece28.o \
|
||||
$(OBJDIR)/juce_AudioSampleBuffer_af6ff195.o \
|
||||
$(OBJDIR)/juce_IIRFilter_9a31e47f.o \
|
||||
|
|
@ -79,6 +78,7 @@ OBJECTS := \
|
|||
$(OBJDIR)/juce_MidiMessage_5b1f5753.o \
|
||||
$(OBJDIR)/juce_MidiMessageCollector_108abdc4.o \
|
||||
$(OBJDIR)/juce_MidiMessageSequence_a577dcb4.o \
|
||||
$(OBJDIR)/juce_MidiOutput_3cc0f43f.o \
|
||||
$(OBJDIR)/juce_VSTPluginFormat_e4d590ea.o \
|
||||
$(OBJDIR)/juce_AudioPluginFormat_a7021cd6.o \
|
||||
$(OBJDIR)/juce_AudioPluginFormatManager_259e5a81.o \
|
||||
|
|
@ -532,11 +532,6 @@ $(OBJDIR)/juce_AudioIODeviceType_e5d402c5.o: ../../src/audio/devices/juce_AudioI
|
|||
@echo "Compiling juce_AudioIODeviceType.cpp"
|
||||
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
|
||||
|
||||
$(OBJDIR)/juce_MidiOutput_f6dc5af3.o: ../../src/audio/devices/juce_MidiOutput.cpp
|
||||
-@mkdir -p $(OBJDIR)
|
||||
@echo "Compiling juce_MidiOutput.cpp"
|
||||
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
|
||||
|
||||
$(OBJDIR)/juce_AudioDataConverters_dc0ece28.o: ../../src/audio/dsp/juce_AudioDataConverters.cpp
|
||||
-@mkdir -p $(OBJDIR)
|
||||
@echo "Compiling juce_AudioDataConverters.cpp"
|
||||
|
|
@ -582,6 +577,11 @@ $(OBJDIR)/juce_MidiMessageSequence_a577dcb4.o: ../../src/audio/midi/juce_MidiMes
|
|||
@echo "Compiling juce_MidiMessageSequence.cpp"
|
||||
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
|
||||
|
||||
$(OBJDIR)/juce_MidiOutput_3cc0f43f.o: ../../src/audio/midi/juce_MidiOutput.cpp
|
||||
-@mkdir -p $(OBJDIR)
|
||||
@echo "Compiling juce_MidiOutput.cpp"
|
||||
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
|
||||
|
||||
$(OBJDIR)/juce_VSTPluginFormat_e4d590ea.o: ../../src/audio/plugins/formats/juce_VSTPluginFormat.cpp
|
||||
-@mkdir -p $(OBJDIR)
|
||||
@echo "Compiling juce_VSTPluginFormat.cpp"
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
0C22446F12486AD139A640CB = { isa = PBXBuildFile; fileRef = 6841D6AC927D02113F3AEBD4; };
|
||||
95CF50482DC7139FCB40EB1C = { isa = PBXBuildFile; fileRef = C7DB1BB9AF7FE0A2AA38D767; };
|
||||
D66B0BC466522CD4C5F1335B = { isa = PBXBuildFile; fileRef = EAFD034BB1721BFBF9A3795E; };
|
||||
D88F095088405AB09F6E6727 = { isa = PBXBuildFile; fileRef = C46C8674BFC28F576AB227F0; };
|
||||
F20E960CAA933102A0F0225C = { isa = PBXBuildFile; fileRef = 5DB9D903D24646B0C2356A5D; };
|
||||
9CDC242CC037F1D00BFD6157 = { isa = PBXBuildFile; fileRef = A1D687AE613A8B61EB63923D; };
|
||||
FB0C4D926F00644C6435F0B4 = { isa = PBXBuildFile; fileRef = E68EB4BC75216B5B56E3F937; };
|
||||
|
|
@ -46,6 +45,7 @@
|
|||
78E7EF1759BA0AACCCE37533 = { isa = PBXBuildFile; fileRef = DF3833AF6E38E55218FDF23F; };
|
||||
573BF08B2CACCC317F3D7603 = { isa = PBXBuildFile; fileRef = 0D3A77572C7256CE4C115FD7; };
|
||||
8376B6E3DB141DDF5EFF6327 = { isa = PBXBuildFile; fileRef = 78D29BB5C76CCF7C21EC0DAF; };
|
||||
B579C891B16F4B219CD751B5 = { isa = PBXBuildFile; fileRef = 01712FF0A160032FA1DAA8C2; };
|
||||
A3C433D146C7E1FFCADFB202 = { isa = PBXBuildFile; fileRef = 68D759C0812F1B2D8B1F0288; };
|
||||
0086CA75A5115F4D3E5D7DF4 = { isa = PBXBuildFile; fileRef = B990275870E5E30554AE4C0B; };
|
||||
C1857884F37C08F550812E99 = { isa = PBXBuildFile; fileRef = F13BFC8AE68ECB6E063BD8D4; };
|
||||
|
|
@ -426,9 +426,6 @@
|
|||
95CA8EE24AFBB1F2F29A5394 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioIODevice.h; path = ../../src/audio/devices/juce_AudioIODevice.h; sourceTree = SOURCE_ROOT; };
|
||||
EAFD034BB1721BFBF9A3795E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioIODeviceType.cpp; path = ../../src/audio/devices/juce_AudioIODeviceType.cpp; sourceTree = SOURCE_ROOT; };
|
||||
EFAFC937377A21E9AC0F9776 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioIODeviceType.h; path = ../../src/audio/devices/juce_AudioIODeviceType.h; sourceTree = SOURCE_ROOT; };
|
||||
2B0428A256E4C4E0B0244131 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiInput.h; path = ../../src/audio/devices/juce_MidiInput.h; sourceTree = SOURCE_ROOT; };
|
||||
C46C8674BFC28F576AB227F0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MidiOutput.cpp; path = ../../src/audio/devices/juce_MidiOutput.cpp; sourceTree = SOURCE_ROOT; };
|
||||
047D856ECB0B4297CBBBFC19 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiOutput.h; path = ../../src/audio/devices/juce_MidiOutput.h; sourceTree = SOURCE_ROOT; };
|
||||
5DB9D903D24646B0C2356A5D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioDataConverters.cpp; path = ../../src/audio/dsp/juce_AudioDataConverters.cpp; sourceTree = SOURCE_ROOT; };
|
||||
EBA6B46F7B3C11CA3744A4D0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioDataConverters.h; path = ../../src/audio/dsp/juce_AudioDataConverters.h; sourceTree = SOURCE_ROOT; };
|
||||
A1D687AE613A8B61EB63923D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioSampleBuffer.cpp; path = ../../src/audio/dsp/juce_AudioSampleBuffer.cpp; sourceTree = SOURCE_ROOT; };
|
||||
|
|
@ -440,6 +437,7 @@
|
|||
0604C2E17F0E0DFEFDA19F8D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiBuffer.h; path = ../../src/audio/midi/juce_MidiBuffer.h; sourceTree = SOURCE_ROOT; };
|
||||
891E0B1AD09C0EA44297E0F2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MidiFile.cpp; path = ../../src/audio/midi/juce_MidiFile.cpp; sourceTree = SOURCE_ROOT; };
|
||||
EBACA038DBB50817BE80E8C5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiFile.h; path = ../../src/audio/midi/juce_MidiFile.h; sourceTree = SOURCE_ROOT; };
|
||||
C376B06C58C5D3C972583BBB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiInput.h; path = ../../src/audio/midi/juce_MidiInput.h; sourceTree = SOURCE_ROOT; };
|
||||
0731C60911E6985F51325484 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MidiKeyboardState.cpp; path = ../../src/audio/midi/juce_MidiKeyboardState.cpp; sourceTree = SOURCE_ROOT; };
|
||||
062F7ACF5282C5B2D4BF5EE1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiKeyboardState.h; path = ../../src/audio/midi/juce_MidiKeyboardState.h; sourceTree = SOURCE_ROOT; };
|
||||
DF3833AF6E38E55218FDF23F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MidiMessage.cpp; path = ../../src/audio/midi/juce_MidiMessage.cpp; sourceTree = SOURCE_ROOT; };
|
||||
|
|
@ -448,6 +446,8 @@
|
|||
A22A0F77C15B1E4A8F2EB42A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiMessageCollector.h; path = ../../src/audio/midi/juce_MidiMessageCollector.h; sourceTree = SOURCE_ROOT; };
|
||||
78D29BB5C76CCF7C21EC0DAF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MidiMessageSequence.cpp; path = ../../src/audio/midi/juce_MidiMessageSequence.cpp; sourceTree = SOURCE_ROOT; };
|
||||
DD3886D45B5988B4DAC2D049 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiMessageSequence.h; path = ../../src/audio/midi/juce_MidiMessageSequence.h; sourceTree = SOURCE_ROOT; };
|
||||
01712FF0A160032FA1DAA8C2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MidiOutput.cpp; path = ../../src/audio/midi/juce_MidiOutput.cpp; sourceTree = SOURCE_ROOT; };
|
||||
899BD7E18BE1EF7CDF53784C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiOutput.h; path = ../../src/audio/midi/juce_MidiOutput.h; sourceTree = SOURCE_ROOT; };
|
||||
1D420B75C62607886A571698 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_AU_Wrapper.mm; path = "../../extras/audio plugins/wrapper/AU/juce_AU_Wrapper.mm"; sourceTree = SOURCE_ROOT; };
|
||||
451684777825E63BCAD84F80 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_RTAS_DigiCode_Header.h; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_DigiCode_Header.h"; sourceTree = SOURCE_ROOT; };
|
||||
34AB1C83D6D5BB468415EF9F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_DigiCode1.cpp; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_DigiCode1.cpp"; sourceTree = SOURCE_ROOT; };
|
||||
|
|
@ -1157,10 +1157,7 @@
|
|||
C7DB1BB9AF7FE0A2AA38D767,
|
||||
95CA8EE24AFBB1F2F29A5394,
|
||||
EAFD034BB1721BFBF9A3795E,
|
||||
EFAFC937377A21E9AC0F9776,
|
||||
2B0428A256E4C4E0B0244131,
|
||||
C46C8674BFC28F576AB227F0,
|
||||
047D856ECB0B4297CBBBFC19 ); name = devices; sourceTree = "<group>"; };
|
||||
EFAFC937377A21E9AC0F9776 ); name = devices; sourceTree = "<group>"; };
|
||||
53C441C8EEF2860715CC6599 = { isa = PBXGroup; children = (
|
||||
5DB9D903D24646B0C2356A5D,
|
||||
EBA6B46F7B3C11CA3744A4D0,
|
||||
|
|
@ -1174,6 +1171,7 @@
|
|||
0604C2E17F0E0DFEFDA19F8D,
|
||||
891E0B1AD09C0EA44297E0F2,
|
||||
EBACA038DBB50817BE80E8C5,
|
||||
C376B06C58C5D3C972583BBB,
|
||||
0731C60911E6985F51325484,
|
||||
062F7ACF5282C5B2D4BF5EE1,
|
||||
DF3833AF6E38E55218FDF23F,
|
||||
|
|
@ -1181,7 +1179,9 @@
|
|||
0D3A77572C7256CE4C115FD7,
|
||||
A22A0F77C15B1E4A8F2EB42A,
|
||||
78D29BB5C76CCF7C21EC0DAF,
|
||||
DD3886D45B5988B4DAC2D049 ); name = midi; sourceTree = "<group>"; };
|
||||
DD3886D45B5988B4DAC2D049,
|
||||
01712FF0A160032FA1DAA8C2,
|
||||
899BD7E18BE1EF7CDF53784C ); name = midi; sourceTree = "<group>"; };
|
||||
844109733F09B5915AF75797 = { isa = PBXGroup; children = (
|
||||
1D420B75C62607886A571698 ); name = AU; sourceTree = "<group>"; };
|
||||
FAA6189E385BD13EFEFE2E08 = { isa = PBXGroup; children = (
|
||||
|
|
@ -2053,7 +2053,6 @@
|
|||
0C22446F12486AD139A640CB,
|
||||
95CF50482DC7139FCB40EB1C,
|
||||
D66B0BC466522CD4C5F1335B,
|
||||
D88F095088405AB09F6E6727,
|
||||
F20E960CAA933102A0F0225C,
|
||||
9CDC242CC037F1D00BFD6157,
|
||||
FB0C4D926F00644C6435F0B4,
|
||||
|
|
@ -2063,6 +2062,7 @@
|
|||
78E7EF1759BA0AACCCE37533,
|
||||
573BF08B2CACCC317F3D7603,
|
||||
8376B6E3DB141DDF5EFF6327,
|
||||
B579C891B16F4B219CD751B5,
|
||||
A3C433D146C7E1FFCADFB202,
|
||||
0086CA75A5115F4D3E5D7DF4,
|
||||
C1857884F37C08F550812E99,
|
||||
|
|
|
|||
|
|
@ -172,9 +172,6 @@
|
|||
<File RelativePath="..\..\src\audio\devices\juce_AudioIODevice.h"/>
|
||||
<File RelativePath="..\..\src\audio\devices\juce_AudioIODeviceType.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\devices\juce_AudioIODeviceType.h"/>
|
||||
<File RelativePath="..\..\src\audio\devices\juce_MidiInput.h"/>
|
||||
<File RelativePath="..\..\src\audio\devices\juce_MidiOutput.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\devices\juce_MidiOutput.h"/>
|
||||
</Filter>
|
||||
<Filter Name="dsp">
|
||||
<File RelativePath="..\..\src\audio\dsp\juce_AudioDataConverters.cpp"/>
|
||||
|
|
@ -190,6 +187,7 @@
|
|||
<File RelativePath="..\..\src\audio\midi\juce_MidiBuffer.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiFile.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiFile.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiInput.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiKeyboardState.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiKeyboardState.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiMessage.cpp"/>
|
||||
|
|
@ -198,6 +196,8 @@
|
|||
<File RelativePath="..\..\src\audio\midi\juce_MidiMessageCollector.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiMessageSequence.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiMessageSequence.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiOutput.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiOutput.h"/>
|
||||
</Filter>
|
||||
<Filter Name="plugins">
|
||||
<Filter Name="wrapper code">
|
||||
|
|
|
|||
|
|
@ -172,9 +172,6 @@
|
|||
<File RelativePath="..\..\src\audio\devices\juce_AudioIODevice.h"/>
|
||||
<File RelativePath="..\..\src\audio\devices\juce_AudioIODeviceType.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\devices\juce_AudioIODeviceType.h"/>
|
||||
<File RelativePath="..\..\src\audio\devices\juce_MidiInput.h"/>
|
||||
<File RelativePath="..\..\src\audio\devices\juce_MidiOutput.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\devices\juce_MidiOutput.h"/>
|
||||
</Filter>
|
||||
<Filter Name="dsp">
|
||||
<File RelativePath="..\..\src\audio\dsp\juce_AudioDataConverters.cpp"/>
|
||||
|
|
@ -190,6 +187,7 @@
|
|||
<File RelativePath="..\..\src\audio\midi\juce_MidiBuffer.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiFile.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiFile.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiInput.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiKeyboardState.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiKeyboardState.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiMessage.cpp"/>
|
||||
|
|
@ -198,6 +196,8 @@
|
|||
<File RelativePath="..\..\src\audio\midi\juce_MidiMessageCollector.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiMessageSequence.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiMessageSequence.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiOutput.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiOutput.h"/>
|
||||
</Filter>
|
||||
<Filter Name="plugins">
|
||||
<Filter Name="wrapper code">
|
||||
|
|
|
|||
|
|
@ -174,9 +174,6 @@
|
|||
<File RelativePath="..\..\src\audio\devices\juce_AudioIODevice.h"/>
|
||||
<File RelativePath="..\..\src\audio\devices\juce_AudioIODeviceType.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\devices\juce_AudioIODeviceType.h"/>
|
||||
<File RelativePath="..\..\src\audio\devices\juce_MidiInput.h"/>
|
||||
<File RelativePath="..\..\src\audio\devices\juce_MidiOutput.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\devices\juce_MidiOutput.h"/>
|
||||
</Filter>
|
||||
<Filter Name="dsp">
|
||||
<File RelativePath="..\..\src\audio\dsp\juce_AudioDataConverters.cpp"/>
|
||||
|
|
@ -192,6 +189,7 @@
|
|||
<File RelativePath="..\..\src\audio\midi\juce_MidiBuffer.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiFile.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiFile.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiInput.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiKeyboardState.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiKeyboardState.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiMessage.cpp"/>
|
||||
|
|
@ -200,6 +198,8 @@
|
|||
<File RelativePath="..\..\src\audio\midi\juce_MidiMessageCollector.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiMessageSequence.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiMessageSequence.h"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiOutput.cpp"/>
|
||||
<File RelativePath="..\..\src\audio\midi\juce_MidiOutput.h"/>
|
||||
</Filter>
|
||||
<Filter Name="plugins">
|
||||
<Filter Name="wrapper code">
|
||||
|
|
|
|||
|
|
@ -152,7 +152,6 @@
|
|||
<ClCompile Include="..\..\src\audio\devices\juce_AudioDeviceManager.cpp"/>
|
||||
<ClCompile Include="..\..\src\audio\devices\juce_AudioIODevice.cpp"/>
|
||||
<ClCompile Include="..\..\src\audio\devices\juce_AudioIODeviceType.cpp"/>
|
||||
<ClCompile Include="..\..\src\audio\devices\juce_MidiOutput.cpp"/>
|
||||
<ClCompile Include="..\..\src\audio\dsp\juce_AudioDataConverters.cpp"/>
|
||||
<ClCompile Include="..\..\src\audio\dsp\juce_AudioSampleBuffer.cpp"/>
|
||||
<ClCompile Include="..\..\src\audio\dsp\juce_IIRFilter.cpp"/>
|
||||
|
|
@ -162,6 +161,7 @@
|
|||
<ClCompile Include="..\..\src\audio\midi\juce_MidiMessage.cpp"/>
|
||||
<ClCompile Include="..\..\src\audio\midi\juce_MidiMessageCollector.cpp"/>
|
||||
<ClCompile Include="..\..\src\audio\midi\juce_MidiMessageSequence.cpp"/>
|
||||
<ClCompile Include="..\..\src\audio\midi\juce_MidiOutput.cpp"/>
|
||||
<ClCompile Include="..\..\src\audio\plugins\formats\juce_VSTPluginFormat.cpp"/>
|
||||
<ClCompile Include="..\..\src\audio\plugins\juce_AudioPluginFormat.cpp"/>
|
||||
<ClCompile Include="..\..\src\audio\plugins\juce_AudioPluginFormatManager.cpp"/>
|
||||
|
|
@ -485,18 +485,18 @@
|
|||
<ClInclude Include="..\..\src\audio\devices\juce_AudioDeviceManager.h"/>
|
||||
<ClInclude Include="..\..\src\audio\devices\juce_AudioIODevice.h"/>
|
||||
<ClInclude Include="..\..\src\audio\devices\juce_AudioIODeviceType.h"/>
|
||||
<ClInclude Include="..\..\src\audio\devices\juce_MidiInput.h"/>
|
||||
<ClInclude Include="..\..\src\audio\devices\juce_MidiOutput.h"/>
|
||||
<ClInclude Include="..\..\src\audio\dsp\juce_AudioDataConverters.h"/>
|
||||
<ClInclude Include="..\..\src\audio\dsp\juce_AudioSampleBuffer.h"/>
|
||||
<ClInclude Include="..\..\src\audio\dsp\juce_Decibels.h"/>
|
||||
<ClInclude Include="..\..\src\audio\dsp\juce_IIRFilter.h"/>
|
||||
<ClInclude Include="..\..\src\audio\midi\juce_MidiBuffer.h"/>
|
||||
<ClInclude Include="..\..\src\audio\midi\juce_MidiFile.h"/>
|
||||
<ClInclude Include="..\..\src\audio\midi\juce_MidiInput.h"/>
|
||||
<ClInclude Include="..\..\src\audio\midi\juce_MidiKeyboardState.h"/>
|
||||
<ClInclude Include="..\..\src\audio\midi\juce_MidiMessage.h"/>
|
||||
<ClInclude Include="..\..\src\audio\midi\juce_MidiMessageCollector.h"/>
|
||||
<ClInclude Include="..\..\src\audio\midi\juce_MidiMessageSequence.h"/>
|
||||
<ClInclude Include="..\..\src\audio\midi\juce_MidiOutput.h"/>
|
||||
<ClInclude Include="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode_Header.h"/>
|
||||
<ClInclude Include="..\..\extras\audio plugins\wrapper\Standalone\juce_AudioFilterStreamer.h"/>
|
||||
<ClInclude Include="..\..\extras\audio plugins\wrapper\Standalone\juce_StandaloneFilterWindow.h"/>
|
||||
|
|
|
|||
|
|
@ -277,9 +277,6 @@
|
|||
<ClCompile Include="..\..\src\audio\devices\juce_AudioIODeviceType.cpp">
|
||||
<Filter>Juce\Source\audio\devices</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\audio\devices\juce_MidiOutput.cpp">
|
||||
<Filter>Juce\Source\audio\devices</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\audio\dsp\juce_AudioDataConverters.cpp">
|
||||
<Filter>Juce\Source\audio\dsp</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -307,6 +304,9 @@
|
|||
<ClCompile Include="..\..\src\audio\midi\juce_MidiMessageSequence.cpp">
|
||||
<Filter>Juce\Source\audio\midi</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\audio\midi\juce_MidiOutput.cpp">
|
||||
<Filter>Juce\Source\audio\midi</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\extras\audio plugins\wrapper\AU\juce_AU_Wrapper.mm">
|
||||
<Filter>Juce\Source\audio\plugins\wrapper code\AU</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -1389,12 +1389,6 @@
|
|||
<ClInclude Include="..\..\src\audio\devices\juce_AudioIODeviceType.h">
|
||||
<Filter>Juce\Source\audio\devices</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\audio\devices\juce_MidiInput.h">
|
||||
<Filter>Juce\Source\audio\devices</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\audio\devices\juce_MidiOutput.h">
|
||||
<Filter>Juce\Source\audio\devices</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\audio\dsp\juce_AudioDataConverters.h">
|
||||
<Filter>Juce\Source\audio\dsp</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -1413,6 +1407,9 @@
|
|||
<ClInclude Include="..\..\src\audio\midi\juce_MidiFile.h">
|
||||
<Filter>Juce\Source\audio\midi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\audio\midi\juce_MidiInput.h">
|
||||
<Filter>Juce\Source\audio\midi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\audio\midi\juce_MidiKeyboardState.h">
|
||||
<Filter>Juce\Source\audio\midi</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -1425,6 +1422,9 @@
|
|||
<ClInclude Include="..\..\src\audio\midi\juce_MidiMessageSequence.h">
|
||||
<Filter>Juce\Source\audio\midi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\audio\midi\juce_MidiOutput.h">
|
||||
<Filter>Juce\Source\audio\midi</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode_Header.h">
|
||||
<Filter>Juce\Source\audio\plugins\wrapper code\RTAS</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
0C22446F12486AD139A640CB = { isa = PBXBuildFile; fileRef = 6841D6AC927D02113F3AEBD4; };
|
||||
95CF50482DC7139FCB40EB1C = { isa = PBXBuildFile; fileRef = C7DB1BB9AF7FE0A2AA38D767; };
|
||||
D66B0BC466522CD4C5F1335B = { isa = PBXBuildFile; fileRef = EAFD034BB1721BFBF9A3795E; };
|
||||
D88F095088405AB09F6E6727 = { isa = PBXBuildFile; fileRef = C46C8674BFC28F576AB227F0; };
|
||||
F20E960CAA933102A0F0225C = { isa = PBXBuildFile; fileRef = 5DB9D903D24646B0C2356A5D; };
|
||||
9CDC242CC037F1D00BFD6157 = { isa = PBXBuildFile; fileRef = A1D687AE613A8B61EB63923D; };
|
||||
FB0C4D926F00644C6435F0B4 = { isa = PBXBuildFile; fileRef = E68EB4BC75216B5B56E3F937; };
|
||||
|
|
@ -46,6 +45,7 @@
|
|||
78E7EF1759BA0AACCCE37533 = { isa = PBXBuildFile; fileRef = DF3833AF6E38E55218FDF23F; };
|
||||
573BF08B2CACCC317F3D7603 = { isa = PBXBuildFile; fileRef = 0D3A77572C7256CE4C115FD7; };
|
||||
8376B6E3DB141DDF5EFF6327 = { isa = PBXBuildFile; fileRef = 78D29BB5C76CCF7C21EC0DAF; };
|
||||
B579C891B16F4B219CD751B5 = { isa = PBXBuildFile; fileRef = 01712FF0A160032FA1DAA8C2; };
|
||||
A3C433D146C7E1FFCADFB202 = { isa = PBXBuildFile; fileRef = 68D759C0812F1B2D8B1F0288; };
|
||||
0086CA75A5115F4D3E5D7DF4 = { isa = PBXBuildFile; fileRef = B990275870E5E30554AE4C0B; };
|
||||
C1857884F37C08F550812E99 = { isa = PBXBuildFile; fileRef = F13BFC8AE68ECB6E063BD8D4; };
|
||||
|
|
@ -426,9 +426,6 @@
|
|||
95CA8EE24AFBB1F2F29A5394 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioIODevice.h; path = ../../src/audio/devices/juce_AudioIODevice.h; sourceTree = SOURCE_ROOT; };
|
||||
EAFD034BB1721BFBF9A3795E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioIODeviceType.cpp; path = ../../src/audio/devices/juce_AudioIODeviceType.cpp; sourceTree = SOURCE_ROOT; };
|
||||
EFAFC937377A21E9AC0F9776 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioIODeviceType.h; path = ../../src/audio/devices/juce_AudioIODeviceType.h; sourceTree = SOURCE_ROOT; };
|
||||
2B0428A256E4C4E0B0244131 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiInput.h; path = ../../src/audio/devices/juce_MidiInput.h; sourceTree = SOURCE_ROOT; };
|
||||
C46C8674BFC28F576AB227F0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MidiOutput.cpp; path = ../../src/audio/devices/juce_MidiOutput.cpp; sourceTree = SOURCE_ROOT; };
|
||||
047D856ECB0B4297CBBBFC19 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiOutput.h; path = ../../src/audio/devices/juce_MidiOutput.h; sourceTree = SOURCE_ROOT; };
|
||||
5DB9D903D24646B0C2356A5D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioDataConverters.cpp; path = ../../src/audio/dsp/juce_AudioDataConverters.cpp; sourceTree = SOURCE_ROOT; };
|
||||
EBA6B46F7B3C11CA3744A4D0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioDataConverters.h; path = ../../src/audio/dsp/juce_AudioDataConverters.h; sourceTree = SOURCE_ROOT; };
|
||||
A1D687AE613A8B61EB63923D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioSampleBuffer.cpp; path = ../../src/audio/dsp/juce_AudioSampleBuffer.cpp; sourceTree = SOURCE_ROOT; };
|
||||
|
|
@ -440,6 +437,7 @@
|
|||
0604C2E17F0E0DFEFDA19F8D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiBuffer.h; path = ../../src/audio/midi/juce_MidiBuffer.h; sourceTree = SOURCE_ROOT; };
|
||||
891E0B1AD09C0EA44297E0F2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MidiFile.cpp; path = ../../src/audio/midi/juce_MidiFile.cpp; sourceTree = SOURCE_ROOT; };
|
||||
EBACA038DBB50817BE80E8C5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiFile.h; path = ../../src/audio/midi/juce_MidiFile.h; sourceTree = SOURCE_ROOT; };
|
||||
C376B06C58C5D3C972583BBB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiInput.h; path = ../../src/audio/midi/juce_MidiInput.h; sourceTree = SOURCE_ROOT; };
|
||||
0731C60911E6985F51325484 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MidiKeyboardState.cpp; path = ../../src/audio/midi/juce_MidiKeyboardState.cpp; sourceTree = SOURCE_ROOT; };
|
||||
062F7ACF5282C5B2D4BF5EE1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiKeyboardState.h; path = ../../src/audio/midi/juce_MidiKeyboardState.h; sourceTree = SOURCE_ROOT; };
|
||||
DF3833AF6E38E55218FDF23F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MidiMessage.cpp; path = ../../src/audio/midi/juce_MidiMessage.cpp; sourceTree = SOURCE_ROOT; };
|
||||
|
|
@ -448,6 +446,8 @@
|
|||
A22A0F77C15B1E4A8F2EB42A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiMessageCollector.h; path = ../../src/audio/midi/juce_MidiMessageCollector.h; sourceTree = SOURCE_ROOT; };
|
||||
78D29BB5C76CCF7C21EC0DAF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MidiMessageSequence.cpp; path = ../../src/audio/midi/juce_MidiMessageSequence.cpp; sourceTree = SOURCE_ROOT; };
|
||||
DD3886D45B5988B4DAC2D049 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiMessageSequence.h; path = ../../src/audio/midi/juce_MidiMessageSequence.h; sourceTree = SOURCE_ROOT; };
|
||||
01712FF0A160032FA1DAA8C2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MidiOutput.cpp; path = ../../src/audio/midi/juce_MidiOutput.cpp; sourceTree = SOURCE_ROOT; };
|
||||
899BD7E18BE1EF7CDF53784C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiOutput.h; path = ../../src/audio/midi/juce_MidiOutput.h; sourceTree = SOURCE_ROOT; };
|
||||
1D420B75C62607886A571698 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_AU_Wrapper.mm; path = "../../extras/audio plugins/wrapper/AU/juce_AU_Wrapper.mm"; sourceTree = SOURCE_ROOT; };
|
||||
451684777825E63BCAD84F80 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_RTAS_DigiCode_Header.h; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_DigiCode_Header.h"; sourceTree = SOURCE_ROOT; };
|
||||
34AB1C83D6D5BB468415EF9F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_DigiCode1.cpp; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_DigiCode1.cpp"; sourceTree = SOURCE_ROOT; };
|
||||
|
|
@ -1157,10 +1157,7 @@
|
|||
C7DB1BB9AF7FE0A2AA38D767,
|
||||
95CA8EE24AFBB1F2F29A5394,
|
||||
EAFD034BB1721BFBF9A3795E,
|
||||
EFAFC937377A21E9AC0F9776,
|
||||
2B0428A256E4C4E0B0244131,
|
||||
C46C8674BFC28F576AB227F0,
|
||||
047D856ECB0B4297CBBBFC19 ); name = devices; sourceTree = "<group>"; };
|
||||
EFAFC937377A21E9AC0F9776 ); name = devices; sourceTree = "<group>"; };
|
||||
53C441C8EEF2860715CC6599 = { isa = PBXGroup; children = (
|
||||
5DB9D903D24646B0C2356A5D,
|
||||
EBA6B46F7B3C11CA3744A4D0,
|
||||
|
|
@ -1174,6 +1171,7 @@
|
|||
0604C2E17F0E0DFEFDA19F8D,
|
||||
891E0B1AD09C0EA44297E0F2,
|
||||
EBACA038DBB50817BE80E8C5,
|
||||
C376B06C58C5D3C972583BBB,
|
||||
0731C60911E6985F51325484,
|
||||
062F7ACF5282C5B2D4BF5EE1,
|
||||
DF3833AF6E38E55218FDF23F,
|
||||
|
|
@ -1181,7 +1179,9 @@
|
|||
0D3A77572C7256CE4C115FD7,
|
||||
A22A0F77C15B1E4A8F2EB42A,
|
||||
78D29BB5C76CCF7C21EC0DAF,
|
||||
DD3886D45B5988B4DAC2D049 ); name = midi; sourceTree = "<group>"; };
|
||||
DD3886D45B5988B4DAC2D049,
|
||||
01712FF0A160032FA1DAA8C2,
|
||||
899BD7E18BE1EF7CDF53784C ); name = midi; sourceTree = "<group>"; };
|
||||
844109733F09B5915AF75797 = { isa = PBXGroup; children = (
|
||||
1D420B75C62607886A571698 ); name = AU; sourceTree = "<group>"; };
|
||||
FAA6189E385BD13EFEFE2E08 = { isa = PBXGroup; children = (
|
||||
|
|
@ -2057,7 +2057,6 @@
|
|||
0C22446F12486AD139A640CB,
|
||||
95CF50482DC7139FCB40EB1C,
|
||||
D66B0BC466522CD4C5F1335B,
|
||||
D88F095088405AB09F6E6727,
|
||||
F20E960CAA933102A0F0225C,
|
||||
9CDC242CC037F1D00BFD6157,
|
||||
FB0C4D926F00644C6435F0B4,
|
||||
|
|
@ -2067,6 +2066,7 @@
|
|||
78E7EF1759BA0AACCCE37533,
|
||||
573BF08B2CACCC317F3D7603,
|
||||
8376B6E3DB141DDF5EFF6327,
|
||||
B579C891B16F4B219CD751B5,
|
||||
A3C433D146C7E1FFCADFB202,
|
||||
0086CA75A5115F4D3E5D7DF4,
|
||||
C1857884F37C08F550812E99,
|
||||
|
|
|
|||
12
Juce.jucer
12
Juce.jucer
|
|
@ -173,12 +173,6 @@
|
|||
file="src/audio/devices/juce_AudioIODeviceType.cpp"/>
|
||||
<FILE id="3KG3Y3kcE" name="juce_AudioIODeviceType.h" compile="0" resource="0"
|
||||
file="src/audio/devices/juce_AudioIODeviceType.h"/>
|
||||
<FILE id="1MAVwUzyb" name="juce_MidiInput.h" compile="0" resource="0"
|
||||
file="src/audio/devices/juce_MidiInput.h"/>
|
||||
<FILE id="3mOyjl6Dz" name="juce_MidiOutput.cpp" compile="1" resource="0"
|
||||
file="src/audio/devices/juce_MidiOutput.cpp"/>
|
||||
<FILE id="5pzlP77pj" name="juce_MidiOutput.h" compile="0" resource="0"
|
||||
file="src/audio/devices/juce_MidiOutput.h"/>
|
||||
</GROUP>
|
||||
<GROUP id="JEC3xi6Gk" name="dsp">
|
||||
<FILE id="b44zjbiH2" name="juce_AudioDataConverters.cpp" compile="1"
|
||||
|
|
@ -205,6 +199,8 @@
|
|||
file="src/audio/midi/juce_MidiFile.cpp"/>
|
||||
<FILE id="YjJL88613" name="juce_MidiFile.h" compile="0" resource="0"
|
||||
file="src/audio/midi/juce_MidiFile.h"/>
|
||||
<FILE id="YgtuNQ" name="juce_MidiInput.h" compile="0" resource="0"
|
||||
file="src/audio/midi/juce_MidiInput.h"/>
|
||||
<FILE id="5J6iavXIB" name="juce_MidiKeyboardState.cpp" compile="1"
|
||||
resource="0" file="src/audio/midi/juce_MidiKeyboardState.cpp"/>
|
||||
<FILE id="Vq6VqUSqR" name="juce_MidiKeyboardState.h" compile="0" resource="0"
|
||||
|
|
@ -221,6 +217,10 @@
|
|||
resource="0" file="src/audio/midi/juce_MidiMessageSequence.cpp"/>
|
||||
<FILE id="4hDIb1h50" name="juce_MidiMessageSequence.h" compile="0"
|
||||
resource="0" file="src/audio/midi/juce_MidiMessageSequence.h"/>
|
||||
<FILE id="dhtLL" name="juce_MidiOutput.cpp" compile="1" resource="0"
|
||||
file="src/audio/midi/juce_MidiOutput.cpp"/>
|
||||
<FILE id="EkOemA" name="juce_MidiOutput.h" compile="0" resource="0"
|
||||
file="src/audio/midi/juce_MidiOutput.h"/>
|
||||
</GROUP>
|
||||
<GROUP id="rWnJUOyOY" name="plugins">
|
||||
<GROUP id="2KbZnNZ" name="wrapper code">
|
||||
|
|
|
|||
|
|
@ -189,10 +189,10 @@
|
|||
#include "../src/audio/devices/juce_AudioDeviceManager.cpp"
|
||||
#include "../src/audio/devices/juce_AudioIODevice.cpp"
|
||||
#include "../src/audio/devices/juce_AudioIODeviceType.cpp"
|
||||
#include "../src/audio/devices/juce_MidiOutput.cpp"
|
||||
#include "../src/audio/dsp/juce_AudioDataConverters.cpp"
|
||||
#include "../src/audio/dsp/juce_AudioSampleBuffer.cpp"
|
||||
#include "../src/audio/dsp/juce_IIRFilter.cpp"
|
||||
#include "../src/audio/midi/juce_MidiOutput.cpp"
|
||||
#include "../src/audio/midi/juce_MidiBuffer.cpp"
|
||||
#include "../src/audio/midi/juce_MidiFile.cpp"
|
||||
#include "../src/audio/midi/juce_MidiKeyboardState.cpp"
|
||||
|
|
|
|||
|
|
@ -314,6 +314,7 @@ private:
|
|||
executable->setAttribute ("dir", "${basedir}");
|
||||
executable->setAttribute ("failonerror", "true");
|
||||
|
||||
executable->createNewChildElement ("arg")->setAttribute ("value", "--jobs=2");
|
||||
executable->createNewChildElement ("arg")->setAttribute ("value", arg);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26097,149 +26097,6 @@ END_JUCE_NAMESPACE
|
|||
/*** End of inlined file: juce_AudioIODeviceType.cpp ***/
|
||||
|
||||
|
||||
/*** Start of inlined file: juce_MidiOutput.cpp ***/
|
||||
BEGIN_JUCE_NAMESPACE
|
||||
|
||||
MidiOutput::MidiOutput()
|
||||
: Thread ("midi out"),
|
||||
internal (0),
|
||||
firstMessage (0)
|
||||
{
|
||||
}
|
||||
|
||||
MidiOutput::PendingMessage::PendingMessage (const uint8* const data, const int len,
|
||||
const double sampleNumber)
|
||||
: message (data, len, sampleNumber)
|
||||
{
|
||||
}
|
||||
|
||||
void MidiOutput::sendBlockOfMessages (const MidiBuffer& buffer,
|
||||
const double millisecondCounterToStartAt,
|
||||
double samplesPerSecondForBuffer)
|
||||
{
|
||||
// You've got to call startBackgroundThread() for this to actually work..
|
||||
jassert (isThreadRunning());
|
||||
|
||||
// this needs to be a value in the future - RTFM for this method!
|
||||
jassert (millisecondCounterToStartAt > 0);
|
||||
|
||||
const double timeScaleFactor = 1000.0 / samplesPerSecondForBuffer;
|
||||
|
||||
MidiBuffer::Iterator i (buffer);
|
||||
|
||||
const uint8* data;
|
||||
int len, time;
|
||||
|
||||
while (i.getNextEvent (data, len, time))
|
||||
{
|
||||
const double eventTime = millisecondCounterToStartAt + timeScaleFactor * time;
|
||||
|
||||
PendingMessage* const m
|
||||
= new PendingMessage (data, len, eventTime);
|
||||
|
||||
const ScopedLock sl (lock);
|
||||
|
||||
if (firstMessage == 0 || firstMessage->message.getTimeStamp() > eventTime)
|
||||
{
|
||||
m->next = firstMessage;
|
||||
firstMessage = m;
|
||||
}
|
||||
else
|
||||
{
|
||||
PendingMessage* mm = firstMessage;
|
||||
|
||||
while (mm->next != 0 && mm->next->message.getTimeStamp() <= eventTime)
|
||||
mm = mm->next;
|
||||
|
||||
m->next = mm->next;
|
||||
mm->next = m;
|
||||
}
|
||||
}
|
||||
|
||||
notify();
|
||||
}
|
||||
|
||||
void MidiOutput::clearAllPendingMessages()
|
||||
{
|
||||
const ScopedLock sl (lock);
|
||||
|
||||
while (firstMessage != 0)
|
||||
{
|
||||
PendingMessage* const m = firstMessage;
|
||||
firstMessage = firstMessage->next;
|
||||
delete m;
|
||||
}
|
||||
}
|
||||
|
||||
void MidiOutput::startBackgroundThread()
|
||||
{
|
||||
startThread (9);
|
||||
}
|
||||
|
||||
void MidiOutput::stopBackgroundThread()
|
||||
{
|
||||
stopThread (5000);
|
||||
}
|
||||
|
||||
void MidiOutput::run()
|
||||
{
|
||||
while (! threadShouldExit())
|
||||
{
|
||||
uint32 now = Time::getMillisecondCounter();
|
||||
uint32 eventTime = 0;
|
||||
uint32 timeToWait = 500;
|
||||
|
||||
PendingMessage* message;
|
||||
|
||||
{
|
||||
const ScopedLock sl (lock);
|
||||
message = firstMessage;
|
||||
|
||||
if (message != 0)
|
||||
{
|
||||
eventTime = roundToInt (message->message.getTimeStamp());
|
||||
|
||||
if (eventTime > now + 20)
|
||||
{
|
||||
timeToWait = eventTime - (now + 20);
|
||||
message = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
firstMessage = message->next;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (message != 0)
|
||||
{
|
||||
if (eventTime > now)
|
||||
{
|
||||
Time::waitForMillisecondCounter (eventTime);
|
||||
|
||||
if (threadShouldExit())
|
||||
break;
|
||||
}
|
||||
|
||||
if (eventTime > now - 200)
|
||||
sendMessageNow (message->message);
|
||||
|
||||
delete message;
|
||||
}
|
||||
else
|
||||
{
|
||||
jassert (timeToWait < 1000 * 30);
|
||||
wait (timeToWait);
|
||||
}
|
||||
}
|
||||
|
||||
clearAllPendingMessages();
|
||||
}
|
||||
|
||||
END_JUCE_NAMESPACE
|
||||
/*** End of inlined file: juce_MidiOutput.cpp ***/
|
||||
|
||||
|
||||
/*** Start of inlined file: juce_AudioDataConverters.cpp ***/
|
||||
BEGIN_JUCE_NAMESPACE
|
||||
|
||||
|
|
@ -27695,6 +27552,148 @@ END_JUCE_NAMESPACE
|
|||
/*** End of inlined file: juce_IIRFilter.cpp ***/
|
||||
|
||||
|
||||
/*** Start of inlined file: juce_MidiOutput.cpp ***/
|
||||
BEGIN_JUCE_NAMESPACE
|
||||
|
||||
MidiOutput::MidiOutput()
|
||||
: Thread ("midi out"),
|
||||
internal (0),
|
||||
firstMessage (0)
|
||||
{
|
||||
}
|
||||
|
||||
MidiOutput::PendingMessage::PendingMessage (const void* const data, const int len, const double timeStamp)
|
||||
: message (data, len, timeStamp)
|
||||
{
|
||||
}
|
||||
|
||||
void MidiOutput::sendBlockOfMessages (const MidiBuffer& buffer,
|
||||
const double millisecondCounterToStartAt,
|
||||
double samplesPerSecondForBuffer)
|
||||
{
|
||||
// You've got to call startBackgroundThread() for this to actually work..
|
||||
jassert (isThreadRunning());
|
||||
|
||||
// this needs to be a value in the future - RTFM for this method!
|
||||
jassert (millisecondCounterToStartAt > 0);
|
||||
|
||||
const double timeScaleFactor = 1000.0 / samplesPerSecondForBuffer;
|
||||
|
||||
MidiBuffer::Iterator i (buffer);
|
||||
|
||||
const uint8* data;
|
||||
int len, time;
|
||||
|
||||
while (i.getNextEvent (data, len, time))
|
||||
{
|
||||
const double eventTime = millisecondCounterToStartAt + timeScaleFactor * time;
|
||||
|
||||
PendingMessage* const m
|
||||
= new PendingMessage (data, len, eventTime);
|
||||
|
||||
const ScopedLock sl (lock);
|
||||
|
||||
if (firstMessage == 0 || firstMessage->message.getTimeStamp() > eventTime)
|
||||
{
|
||||
m->next = firstMessage;
|
||||
firstMessage = m;
|
||||
}
|
||||
else
|
||||
{
|
||||
PendingMessage* mm = firstMessage;
|
||||
|
||||
while (mm->next != 0 && mm->next->message.getTimeStamp() <= eventTime)
|
||||
mm = mm->next;
|
||||
|
||||
m->next = mm->next;
|
||||
mm->next = m;
|
||||
}
|
||||
}
|
||||
|
||||
notify();
|
||||
}
|
||||
|
||||
void MidiOutput::clearAllPendingMessages()
|
||||
{
|
||||
const ScopedLock sl (lock);
|
||||
|
||||
while (firstMessage != 0)
|
||||
{
|
||||
PendingMessage* const m = firstMessage;
|
||||
firstMessage = firstMessage->next;
|
||||
delete m;
|
||||
}
|
||||
}
|
||||
|
||||
void MidiOutput::startBackgroundThread()
|
||||
{
|
||||
startThread (9);
|
||||
}
|
||||
|
||||
void MidiOutput::stopBackgroundThread()
|
||||
{
|
||||
stopThread (5000);
|
||||
}
|
||||
|
||||
void MidiOutput::run()
|
||||
{
|
||||
while (! threadShouldExit())
|
||||
{
|
||||
uint32 now = Time::getMillisecondCounter();
|
||||
uint32 eventTime = 0;
|
||||
uint32 timeToWait = 500;
|
||||
|
||||
PendingMessage* message;
|
||||
|
||||
{
|
||||
const ScopedLock sl (lock);
|
||||
message = firstMessage;
|
||||
|
||||
if (message != 0)
|
||||
{
|
||||
eventTime = roundToInt (message->message.getTimeStamp());
|
||||
|
||||
if (eventTime > now + 20)
|
||||
{
|
||||
timeToWait = eventTime - (now + 20);
|
||||
message = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
firstMessage = message->next;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (message != 0)
|
||||
{
|
||||
if (eventTime > now)
|
||||
{
|
||||
Time::waitForMillisecondCounter (eventTime);
|
||||
|
||||
if (threadShouldExit())
|
||||
break;
|
||||
}
|
||||
|
||||
if (eventTime > now - 200)
|
||||
sendMessageNow (message->message);
|
||||
|
||||
delete message;
|
||||
}
|
||||
else
|
||||
{
|
||||
jassert (timeToWait < 1000 * 30);
|
||||
wait (timeToWait);
|
||||
}
|
||||
}
|
||||
|
||||
clearAllPendingMessages();
|
||||
}
|
||||
|
||||
END_JUCE_NAMESPACE
|
||||
/*** End of inlined file: juce_MidiOutput.cpp ***/
|
||||
|
||||
|
||||
/*** Start of inlined file: juce_MidiBuffer.cpp ***/
|
||||
BEGIN_JUCE_NAMESPACE
|
||||
|
||||
|
|
@ -87546,7 +87545,7 @@ const Rectangle<float> DrawableImage::getDrawableBounds() const
|
|||
|
||||
bool DrawableImage::hitTest (int x, int y)
|
||||
{
|
||||
return image.isValid() && image.getPixelAt (x, y).getAlpha() >= 127;
|
||||
return Drawable::hitTest (x, y) && image.isValid() && image.getPixelAt (x, y).getAlpha() >= 127;
|
||||
}
|
||||
|
||||
Drawable* DrawableImage::createCopy() const
|
||||
|
|
|
|||
|
|
@ -39183,7 +39183,7 @@ private:
|
|||
class MidiInput;
|
||||
|
||||
/**
|
||||
Receives midi messages from a midi input device.
|
||||
Receives incoming messages from a physical MIDI input device.
|
||||
|
||||
This class is overridden to handle incoming midi messages. See the MidiInput
|
||||
class for more details.
|
||||
|
|
@ -39546,10 +39546,10 @@ private:
|
|||
/*** End of inlined file: juce_MidiBuffer.h ***/
|
||||
|
||||
/**
|
||||
Represents a midi output device.
|
||||
Controls a physical MIDI output device.
|
||||
|
||||
To create one of these, use the static getDevices() method to find out what
|
||||
outputs are available, then use the openDevice() method to try to open one.
|
||||
To create one of these, use the static getDevices() method to get a list of the
|
||||
available output devices, then use the openDevice() method to try to open one.
|
||||
|
||||
@see MidiInput
|
||||
*/
|
||||
|
|
@ -39660,7 +39660,7 @@ protected:
|
|||
|
||||
struct PendingMessage
|
||||
{
|
||||
PendingMessage (const uint8* data, int len, double sampleNumber);
|
||||
PendingMessage (const void* data, int len, double timeStamp);
|
||||
|
||||
MidiMessage message;
|
||||
PendingMessage* next;
|
||||
|
|
@ -43150,12 +43150,6 @@ private:
|
|||
#endif
|
||||
#ifndef __JUCE_AUDIOIODEVICETYPE_JUCEHEADER__
|
||||
|
||||
#endif
|
||||
#ifndef __JUCE_MIDIINPUT_JUCEHEADER__
|
||||
|
||||
#endif
|
||||
#ifndef __JUCE_MIDIOUTPUT_JUCEHEADER__
|
||||
|
||||
#endif
|
||||
#ifndef __JUCE_AUDIODATACONVERTERS_JUCEHEADER__
|
||||
|
||||
|
|
@ -43657,6 +43651,9 @@ private:
|
|||
/*** End of inlined file: juce_MidiFile.h ***/
|
||||
|
||||
|
||||
#endif
|
||||
#ifndef __JUCE_MIDIINPUT_JUCEHEADER__
|
||||
|
||||
#endif
|
||||
#ifndef __JUCE_MIDIKEYBOARDSTATE_JUCEHEADER__
|
||||
|
||||
|
|
@ -43923,6 +43920,9 @@ private:
|
|||
#endif
|
||||
#ifndef __JUCE_MIDIMESSAGESEQUENCE_JUCEHEADER__
|
||||
|
||||
#endif
|
||||
#ifndef __JUCE_MIDIOUTPUT_JUCEHEADER__
|
||||
|
||||
#endif
|
||||
#ifndef __JUCE_AUDIOUNITPLUGINFORMAT_JUCEHEADER__
|
||||
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@
|
|||
#define __JUCE_AUDIODEVICEMANAGER_JUCEHEADER__
|
||||
|
||||
#include "juce_AudioIODeviceType.h"
|
||||
#include "juce_MidiInput.h"
|
||||
#include "juce_MidiOutput.h"
|
||||
#include "../midi/juce_MidiInput.h"
|
||||
#include "../midi/juce_MidiOutput.h"
|
||||
#include "../../text/juce_XmlElement.h"
|
||||
#include "../../gui/components/controls/juce_ComboBox.h"
|
||||
#include "../dsp/juce_AudioSampleBuffer.h"
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ class MidiInput;
|
|||
|
||||
//==============================================================================
|
||||
/**
|
||||
Receives midi messages from a midi input device.
|
||||
Receives incoming messages from a physical MIDI input device.
|
||||
|
||||
This class is overridden to handle incoming midi messages. See the MidiInput
|
||||
class for more details.
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
#ifndef __JUCE_MIDIMESSAGECOLLECTOR_JUCEHEADER__
|
||||
#define __JUCE_MIDIMESSAGECOLLECTOR_JUCEHEADER__
|
||||
|
||||
#include "../devices/juce_MidiInput.h"
|
||||
#include "juce_MidiInput.h"
|
||||
#include "juce_MidiKeyboardState.h"
|
||||
|
||||
//==============================================================================
|
||||
|
|
|
|||
|
|
@ -40,9 +40,8 @@ MidiOutput::MidiOutput()
|
|||
{
|
||||
}
|
||||
|
||||
MidiOutput::PendingMessage::PendingMessage (const uint8* const data, const int len,
|
||||
const double sampleNumber)
|
||||
: message (data, len, sampleNumber)
|
||||
MidiOutput::PendingMessage::PendingMessage (const void* const data, const int len, const double timeStamp)
|
||||
: message (data, len, timeStamp)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -34,10 +34,10 @@
|
|||
|
||||
//==============================================================================
|
||||
/**
|
||||
Represents a midi output device.
|
||||
Controls a physical MIDI output device.
|
||||
|
||||
To create one of these, use the static getDevices() method to find out what
|
||||
outputs are available, then use the openDevice() method to try to open one.
|
||||
To create one of these, use the static getDevices() method to get a list of the
|
||||
available output devices, then use the openDevice() method to try to open one.
|
||||
|
||||
@see MidiInput
|
||||
*/
|
||||
|
|
@ -154,7 +154,7 @@ protected:
|
|||
|
||||
struct PendingMessage
|
||||
{
|
||||
PendingMessage (const uint8* data, int len, double sampleNumber);
|
||||
PendingMessage (const void* data, int len, double timeStamp);
|
||||
|
||||
MidiMessage message;
|
||||
PendingMessage* next;
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
#include "juce_AudioProcessor.h"
|
||||
#include "../devices/juce_AudioIODevice.h"
|
||||
#include "../devices/juce_MidiInput.h"
|
||||
#include "../midi/juce_MidiInput.h"
|
||||
#include "../midi/juce_MidiMessageCollector.h"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ const Rectangle<float> DrawableImage::getDrawableBounds() const
|
|||
|
||||
bool DrawableImage::hitTest (int x, int y)
|
||||
{
|
||||
return image.isValid() && image.getPixelAt (x, y).getAlpha() >= 127;
|
||||
return Drawable::hitTest (x, y) && image.isValid() && image.getPixelAt (x, y).getAlpha() >= 127;
|
||||
}
|
||||
|
||||
Drawable* DrawableImage::createCopy() const
|
||||
|
|
|
|||
|
|
@ -128,12 +128,6 @@
|
|||
#ifndef __JUCE_AUDIOIODEVICETYPE_JUCEHEADER__
|
||||
#include "audio/devices/juce_AudioIODeviceType.h"
|
||||
#endif
|
||||
#ifndef __JUCE_MIDIINPUT_JUCEHEADER__
|
||||
#include "audio/devices/juce_MidiInput.h"
|
||||
#endif
|
||||
#ifndef __JUCE_MIDIOUTPUT_JUCEHEADER__
|
||||
#include "audio/devices/juce_MidiOutput.h"
|
||||
#endif
|
||||
#ifndef __JUCE_AUDIODATACONVERTERS_JUCEHEADER__
|
||||
#include "audio/dsp/juce_AudioDataConverters.h"
|
||||
#endif
|
||||
|
|
@ -152,6 +146,9 @@
|
|||
#ifndef __JUCE_MIDIFILE_JUCEHEADER__
|
||||
#include "audio/midi/juce_MidiFile.h"
|
||||
#endif
|
||||
#ifndef __JUCE_MIDIINPUT_JUCEHEADER__
|
||||
#include "audio/midi/juce_MidiInput.h"
|
||||
#endif
|
||||
#ifndef __JUCE_MIDIKEYBOARDSTATE_JUCEHEADER__
|
||||
#include "audio/midi/juce_MidiKeyboardState.h"
|
||||
#endif
|
||||
|
|
@ -164,6 +161,9 @@
|
|||
#ifndef __JUCE_MIDIMESSAGESEQUENCE_JUCEHEADER__
|
||||
#include "audio/midi/juce_MidiMessageSequence.h"
|
||||
#endif
|
||||
#ifndef __JUCE_MIDIOUTPUT_JUCEHEADER__
|
||||
#include "audio/midi/juce_MidiOutput.h"
|
||||
#endif
|
||||
#ifndef __JUCE_AUDIOUNITPLUGINFORMAT_JUCEHEADER__
|
||||
#include "audio/plugins/formats/juce_AudioUnitPluginFormat.h"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -85,8 +85,8 @@ BEGIN_JUCE_NAMESPACE
|
|||
#include "../../audio/audio_sources/juce_AudioSource.h"
|
||||
#include "../../audio/dsp/juce_AudioDataConverters.h"
|
||||
#include "../../audio/devices/juce_AudioIODeviceType.h"
|
||||
#include "../../audio/devices/juce_MidiOutput.h"
|
||||
#include "../../audio/devices/juce_MidiInput.h"
|
||||
#include "../../audio/midi/juce_MidiOutput.h"
|
||||
#include "../../audio/midi/juce_MidiInput.h"
|
||||
#include "../../containers/juce_ScopedValueSetter.h"
|
||||
#include "../common/juce_MidiDataConcatenator.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -76,8 +76,8 @@ BEGIN_JUCE_NAMESPACE
|
|||
#include "../../audio/dsp/juce_AudioDataConverters.h"
|
||||
#include "../../audio/audio_file_formats/juce_AudioCDReader.h"
|
||||
#include "../../audio/devices/juce_AudioIODeviceType.h"
|
||||
#include "../../audio/devices/juce_MidiOutput.h"
|
||||
#include "../../audio/devices/juce_MidiInput.h"
|
||||
#include "../../audio/midi/juce_MidiOutput.h"
|
||||
#include "../../audio/midi/juce_MidiInput.h"
|
||||
#include "../../gui/graphics/fonts/juce_Font.h"
|
||||
#include "../../gui/graphics/geometry/juce_RectangleList.h"
|
||||
#include "../../gui/graphics/imaging/juce_ImageFileFormat.h"
|
||||
|
|
|
|||
|
|
@ -90,8 +90,8 @@ BEGIN_JUCE_NAMESPACE
|
|||
#include "../../audio/audio_sources/juce_AudioSource.h"
|
||||
#include "../../audio/dsp/juce_AudioDataConverters.h"
|
||||
#include "../../audio/devices/juce_AudioIODeviceType.h"
|
||||
#include "../../audio/devices/juce_MidiOutput.h"
|
||||
#include "../../audio/devices/juce_MidiInput.h"
|
||||
#include "../../audio/midi/juce_MidiOutput.h"
|
||||
#include "../../audio/midi/juce_MidiInput.h"
|
||||
#include "../../containers/juce_ScopedValueSetter.h"
|
||||
#include "../common/juce_MidiDataConcatenator.h"
|
||||
#undef Point
|
||||
|
|
|
|||
|
|
@ -85,8 +85,8 @@ BEGIN_JUCE_NAMESPACE
|
|||
#include "../../audio/audio_sources/juce_AudioSource.h"
|
||||
#include "../../audio/dsp/juce_AudioDataConverters.h"
|
||||
#include "../../audio/devices/juce_AudioIODeviceType.h"
|
||||
#include "../../audio/devices/juce_MidiOutput.h"
|
||||
#include "../../audio/devices/juce_MidiInput.h"
|
||||
#include "../../audio/midi/juce_MidiOutput.h"
|
||||
#include "../../audio/midi/juce_MidiInput.h"
|
||||
#include "../../containers/juce_ScopedValueSetter.h"
|
||||
#include "../common/juce_MidiDataConcatenator.h"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue