Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

javax.media.sound #483

Merged
merged 14 commits into from
Feb 5, 2024
Merged

javax.media.sound #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1d81dee
Remove icedtea implementation of javax.sound. Replace with OpenJDK ve…
wasabii Feb 1, 2024
9c1abd0
Update native SDK version to include Alsa.
wasabii Feb 2, 2024
c75c7b6
Disable Mac OSX support. Currently this is blocked by a failure to in…
wasabii Feb 3, 2024
1d2e379
Remove MS Compatibility version 14. Not sure this is going to work fo…
wasabii Feb 3, 2024
7e711a8
Quite down warnings and errors.
wasabii Feb 3, 2024
4fd6dc3
Enable midi tests. Probably not all of them work, so we'll narrow aft…
wasabii Feb 3, 2024
d2d3659
Add ms extensions back (even for Linux).
wasabii Feb 3, 2024
38a0a7b
Disable tests on OS X specifically.
wasabii Feb 3, 2024
0df6f68
Link against asoun.
wasabii Feb 4, 2024
b8d8aa6
Install libasound.
wasabii Feb 4, 2024
936aa46
sudo
wasabii Feb 4, 2024
cb98d06
Comment bad?
wasabii Feb 4, 2024
7336311
Add missing native end for MacOSXPreferences.
wasabii Feb 4, 2024
2314c5c
Merge branch 'develop' into jsound
wasabii Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/IKVM.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- created

env:
NATIVE_SDK_VERSION: "20230701.1"
NATIVE_SDK_VERSION: "20240202.1"

jobs:
build-openjdk:
Expand Down Expand Up @@ -580,6 +580,10 @@ jobs:
- name: Setup WSL
if: runner.os == 'Windows'
uses: Vampire/setup-wsl@v2
- name: Setup Linux
if: runner.os == 'Linux'
shell: bash
run: sudo apt-get update && sudo apt-get install -y libasound2
- name: Get Test Name
uses: actions/github-script@v6
id: test-name
Expand Down
17 changes: 17 additions & 0 deletions IKVM.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Reflection.Tests", "sr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Java.Tests.Util", "src\IKVM.Java.Tests.Util\IKVM.Java.Tests.Util.csproj", "{00AFE142-5F4F-48DD-90C1-20CC0512C43C}"
EndProject
Project("{6DE1C62B-E8D7-451A-8734-87EAEB46E35B}") = "libjsound", "src\libjsound\libjsound.clangproj", "{19A2D00A-7BAB-4C04-8D05-8753A70E366A}"
EndProject
Project("{6DE1C62B-E8D7-451A-8734-87EAEB46E35B}") = "libjsoundalsa", "src\libjsoundalsa\libjsoundalsa.clangproj", "{012FF3AD-F664-4273-8A9D-056CD3C7D161}"
EndProject
Project("{6DE1C62B-E8D7-451A-8734-87EAEB46E35B}") = "libjsoundds", "src\libjsoundds\libjsoundds.clangproj", "{6B4C1863-85CB-4C8C-8F7A-F5F0A7DCC3B0}"
Project("{6DE1C62B-E8D7-451A-8734-87EAEB46E35B}") = "libosxapp", "src\libosxapp\libosxapp.clangproj", "{0E068B20-9C99-45C5-8D94-A1FF9EDD6739}"
EndProject
Global
Expand Down Expand Up @@ -823,6 +828,18 @@ Global
{00AFE142-5F4F-48DD-90C1-20CC0512C43C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{00AFE142-5F4F-48DD-90C1-20CC0512C43C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{00AFE142-5F4F-48DD-90C1-20CC0512C43C}.Release|Any CPU.Build.0 = Release|Any CPU
{19A2D00A-7BAB-4C04-8D05-8753A70E366A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{19A2D00A-7BAB-4C04-8D05-8753A70E366A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{19A2D00A-7BAB-4C04-8D05-8753A70E366A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{19A2D00A-7BAB-4C04-8D05-8753A70E366A}.Release|Any CPU.Build.0 = Release|Any CPU
{012FF3AD-F664-4273-8A9D-056CD3C7D161}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{012FF3AD-F664-4273-8A9D-056CD3C7D161}.Debug|Any CPU.Build.0 = Debug|Any CPU
{012FF3AD-F664-4273-8A9D-056CD3C7D161}.Release|Any CPU.ActiveCfg = Release|Any CPU
{012FF3AD-F664-4273-8A9D-056CD3C7D161}.Release|Any CPU.Build.0 = Release|Any CPU
{6B4C1863-85CB-4C8C-8F7A-F5F0A7DCC3B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6B4C1863-85CB-4C8C-8F7A-F5F0A7DCC3B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6B4C1863-85CB-4C8C-8F7A-F5F0A7DCC3B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6B4C1863-85CB-4C8C-8F7A-F5F0A7DCC3B0}.Release|Any CPU.Build.0 = Release|Any CPU
{0E068B20-9C99-45C5-8D94-A1FF9EDD6739}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E068B20-9C99-45C5-8D94-A1FF9EDD6739}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E068B20-9C99-45C5-8D94-A1FF9EDD6739}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
15 changes: 13 additions & 2 deletions openjdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,9 @@
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\management\ThreadMXBean.java" />
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\management\UnixOperatingSystemMXBean.java" />
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\management\VMOption.java" />
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\media\sound\MidiDeviceReceiverEnvelope.java" />
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\media\sound\MidiDeviceTransmitterEnvelope.java" />

<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\media\sound\**\*.java" PackagePath="com\sun\media\sound" />

<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\naming\internal\FactoryEnumeration.java" />
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\naming\internal\NamedWeakReference.java" />
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\naming\internal\ResourceManager.java" />
Expand Down Expand Up @@ -1674,6 +1675,16 @@
<OpenJdkResource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\META-INF\services\java.nio.file.spi.FileSystemProvider" ResourcePath="META-INF/services/java.nio.file.spi.FileSystemProvider" />
<OpenJdkResource Include="$(OpenJdkDir)\jdk\src\windows\classes\sun\print\services\javax.print.PrintServiceLookup" ResourcePath="META-INF/services/javax.print.PrintServiceLookup" />
<OpenJdkResource Include="$(OpenJdkDir)\jdk\src\windows\classes\sun\print\services\javax.print.StreamPrintServiceFactory" ResourcePath="META-INF/services/javax.print.StreamPrintServiceFactory" />

<!-- JAVAX_SOUND_SRC_FILES -->
<OpenJdkResource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\media\sound\services\javax.sound.midi.spi.MidiDeviceProvider" ResourcePath="META-INF/services/javax.sound.midi.spi.MidiDeviceProvider" />
<OpenJdkResource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\media\sound\services\javax.sound.midi.spi.MidiFileReader" ResourcePath="META-INF/services/javax.sound.midi.spi.MidiFileReader" />
<OpenJdkResource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\media\sound\services\javax.sound.midi.spi.MidiFileWriter" ResourcePath="META-INF/services/javax.sound.midi.spi.MidiFileWriter" />
<OpenJdkResource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\media\sound\services\javax.sound.midi.spi.SoundbankReader" ResourcePath="META-INF/services/javax.sound.midi.spi.SoundbankReader" />
<OpenJdkResource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\media\sound\services\javax.sound.sampled.spi.AudioFileReader" ResourcePath="META-INF/services/javax.sound.sampled.spi.AudioFileReader" />
<OpenJdkResource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\media\sound\services\javax.sound.sampled.spi.AudioFileWriter" ResourcePath="META-INF/services/javax.sound.sampled.spi.AudioFileWriter" />
<OpenJdkResource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\media\sound\services\javax.sound.sampled.spi.FormatConversionProvider" ResourcePath="META-INF/services/javax.sound.sampled.spi.FormatConversionProvider" />
<OpenJdkResource Include="$(OpenJdkDir)\jdk\src\share\classes\com\sun\media\sound\services\javax.sound.sampled.spi.MixerProvider" ResourcePath="META-INF/services/javax.sound.sampled.spi.MixerProvider" />

<!-- These classes are loaded as resources at runtime to dynamically generate instances. -->
<OpenJdkResource Include="$(OpenJdkDir)\build\linux-x86_64-normal-server-release\jdk\classes\sun\reflect\misc\Trampoline.class" ResourcePath="sun\reflect\misc\Trampoline.class" />
Expand Down
3 changes: 3 additions & 0 deletions src/IKVM.Image-bin/IKVM.Image-bin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
<_ReferencedClangProjects Include="$(MSBuildThisFileDirectory)..\libosxapp\libosxapp.clangproj" SupportedRuntimes="osx-x64;osx-arm64" />
<_ReferencedClangProjects Include="$(MSBuildThisFileDirectory)..\libosx\libosx.clangproj" SupportedRuntimes="osx-x64;osx-arm64" />
<_ReferencedClangProjects Include="$(MSBuildThisFileDirectory)..\libosxkrb5\libosxkrb5.clangproj" SupportedRuntimes="osx-x64;osx-arm64" />
<_ReferencedClangProjects Include="$(MSBuildThisFileDirectory)..\libjsound\libjsound.clangproj" SupportedRuntimes="win-x64;win-x86;win-arm64;linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64" />
<_ReferencedClangProjects Include="$(MSBuildThisFileDirectory)..\libjsoundds\libjsoundds.clangproj" SupportedRuntimes="win-x64;win-x86;win-arm64" />
<_ReferencedClangProjects Include="$(MSBuildThisFileDirectory)..\libjsoundalsa\libjsoundalsa.clangproj" SupportedRuntimes="linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64" />
</ItemGroup>

<Target Name="GetClangProjectReferencesByRuntime" Inputs="@(_ReferencedClangProjects)" Outputs="%(_ReferencedClangProjects.Identity)\null" BeforeTargets="AssignClangProjectConfiguration">
Expand Down
2 changes: 0 additions & 2 deletions src/IKVM.Java/IKVM.Java.runtime.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,8 @@

<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)icedtea_jce\**\*" Link="icedtea_jce\%(RecursiveDir)%(Filename)%(Extension)" />
<None Include="$(MSBuildThisFileDirectory)icedtea_rt\**\*" Link="icedtea_rt\%(RecursiveDir)%(Filename)%(Extension)" />
<None Include="$(MSBuildThisFileDirectory)local\**\*" Link="local\%(RecursiveDir)%(Filename)%(Extension)" />
<Compile Include="$(MSBuildThisFileDirectory)icedtea_jce\**\*.java" Link="icedtea_jce\%(RecursiveDir)%(Filename)%(Extension)" />
<Compile Include="$(MSBuildThisFileDirectory)icedtea_rt\**\*.java" Link="icedtea_rt\%(RecursiveDir)%(Filename)%(Extension)" />
<Compile Include="$(MSBuildThisFileDirectory)local\**\*.java" Link="local\%(RecursiveDir)%(Filename)%(Extension)" />
<None Include="@(OpenJdkSource->WithMetadataValue('RuntimeIdentifier', ''))" LinkBase="openjdk\%(PackagePath)" />
<None Include="@(OpenJdkSource->WithMetadataValue('RuntimeIdentifier', '$(IkvmJavaRuntimeIdentifier)'))" LinkBase="openjdk\%(PackagePath)" />
Expand Down
45 changes: 0 additions & 45 deletions src/IKVM.Java/icedtea_rt/com/sun/media/sound/AbstractPlayer.java
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions src/IKVM.Java/icedtea_rt/com/sun/media/sound/AutoConnectSequencer.java
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions src/IKVM.Java/icedtea_rt/com/sun/media/sound/DataPusher.java
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions src/IKVM.Java/icedtea_rt/com/sun/media/sound/DirectAudioDevice.java
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions src/IKVM.Java/icedtea_rt/com/sun/media/sound/DirectAudioDeviceProvider.java
View file
Open in desktop

This file was deleted.