diff --git a/Third Party/libsoundio-sharp/MarshalExtensions.cs b/Ryujinx.Audio/Native/libsoundio/MarshalExtensions.cs similarity index 100% rename from Third Party/libsoundio-sharp/MarshalExtensions.cs rename to Ryujinx.Audio/Native/libsoundio/MarshalExtensions.cs diff --git a/Third Party/libsoundio-sharp/SoundIO.cs b/Ryujinx.Audio/Native/libsoundio/SoundIO.cs similarity index 100% rename from Third Party/libsoundio-sharp/SoundIO.cs rename to Ryujinx.Audio/Native/libsoundio/SoundIO.cs diff --git a/Third Party/libsoundio-sharp/SoundIOBackend.cs b/Ryujinx.Audio/Native/libsoundio/SoundIOBackend.cs similarity index 100% rename from Third Party/libsoundio-sharp/SoundIOBackend.cs rename to Ryujinx.Audio/Native/libsoundio/SoundIOBackend.cs diff --git a/Third Party/libsoundio-sharp/SoundIOChannelArea.cs b/Ryujinx.Audio/Native/libsoundio/SoundIOChannelArea.cs similarity index 100% rename from Third Party/libsoundio-sharp/SoundIOChannelArea.cs rename to Ryujinx.Audio/Native/libsoundio/SoundIOChannelArea.cs diff --git a/Third Party/libsoundio-sharp/SoundIOChannelAreas.cs b/Ryujinx.Audio/Native/libsoundio/SoundIOChannelAreas.cs similarity index 100% rename from Third Party/libsoundio-sharp/SoundIOChannelAreas.cs rename to Ryujinx.Audio/Native/libsoundio/SoundIOChannelAreas.cs diff --git a/Third Party/libsoundio-sharp/SoundIOChannelId.cs b/Ryujinx.Audio/Native/libsoundio/SoundIOChannelId.cs similarity index 100% rename from Third Party/libsoundio-sharp/SoundIOChannelId.cs rename to Ryujinx.Audio/Native/libsoundio/SoundIOChannelId.cs diff --git a/Third Party/libsoundio-sharp/SoundIOChannelLayout.cs b/Ryujinx.Audio/Native/libsoundio/SoundIOChannelLayout.cs similarity index 100% rename from Third Party/libsoundio-sharp/SoundIOChannelLayout.cs rename to Ryujinx.Audio/Native/libsoundio/SoundIOChannelLayout.cs diff --git a/Third Party/libsoundio-sharp/SoundIODevice.cs b/Ryujinx.Audio/Native/libsoundio/SoundIODevice.cs similarity index 100% rename from Third Party/libsoundio-sharp/SoundIODevice.cs rename to Ryujinx.Audio/Native/libsoundio/SoundIODevice.cs diff --git a/Third Party/libsoundio-sharp/SoundIODeviceAim.cs b/Ryujinx.Audio/Native/libsoundio/SoundIODeviceAim.cs similarity index 100% rename from Third Party/libsoundio-sharp/SoundIODeviceAim.cs rename to Ryujinx.Audio/Native/libsoundio/SoundIODeviceAim.cs diff --git a/Third Party/libsoundio-sharp/SoundIOException.cs b/Ryujinx.Audio/Native/libsoundio/SoundIOException.cs similarity index 100% rename from Third Party/libsoundio-sharp/SoundIOException.cs rename to Ryujinx.Audio/Native/libsoundio/SoundIOException.cs diff --git a/Third Party/libsoundio-sharp/SoundIOFormat.cs b/Ryujinx.Audio/Native/libsoundio/SoundIOFormat.cs similarity index 100% rename from Third Party/libsoundio-sharp/SoundIOFormat.cs rename to Ryujinx.Audio/Native/libsoundio/SoundIOFormat.cs diff --git a/Third Party/libsoundio-sharp/SoundIOInStream.cs b/Ryujinx.Audio/Native/libsoundio/SoundIOInStream.cs similarity index 100% rename from Third Party/libsoundio-sharp/SoundIOInStream.cs rename to Ryujinx.Audio/Native/libsoundio/SoundIOInStream.cs diff --git a/Third Party/libsoundio-sharp/SoundIOOutStream.cs b/Ryujinx.Audio/Native/libsoundio/SoundIOOutStream.cs similarity index 100% rename from Third Party/libsoundio-sharp/SoundIOOutStream.cs rename to Ryujinx.Audio/Native/libsoundio/SoundIOOutStream.cs diff --git a/Third Party/libsoundio-sharp/SoundIORingBuffer.cs b/Ryujinx.Audio/Native/libsoundio/SoundIORingBuffer.cs similarity index 100% rename from Third Party/libsoundio-sharp/SoundIORingBuffer.cs rename to Ryujinx.Audio/Native/libsoundio/SoundIORingBuffer.cs diff --git a/Third Party/libsoundio-sharp/SoundIOSampleRateRange.cs b/Ryujinx.Audio/Native/libsoundio/SoundIOSampleRateRange.cs similarity index 100% rename from Third Party/libsoundio-sharp/SoundIOSampleRateRange.cs rename to Ryujinx.Audio/Native/libsoundio/SoundIOSampleRateRange.cs diff --git a/Third Party/libsoundio-sharp/libs/libsoundio.dll b/Ryujinx.Audio/Native/libsoundio/libs/libsoundio.dll similarity index 100% rename from Third Party/libsoundio-sharp/libs/libsoundio.dll rename to Ryujinx.Audio/Native/libsoundio/libs/libsoundio.dll diff --git a/Third Party/libsoundio-sharp/libs/libsoundio.dylib b/Ryujinx.Audio/Native/libsoundio/libs/libsoundio.dylib similarity index 100% rename from Third Party/libsoundio-sharp/libs/libsoundio.dylib rename to Ryujinx.Audio/Native/libsoundio/libs/libsoundio.dylib diff --git a/Third Party/libsoundio-sharp/libs/libsoundio.so b/Ryujinx.Audio/Native/libsoundio/libs/libsoundio.so similarity index 100% rename from Third Party/libsoundio-sharp/libs/libsoundio.so rename to Ryujinx.Audio/Native/libsoundio/libs/libsoundio.so diff --git a/Third Party/libsoundio-sharp/libsoundio-interop.cs b/Ryujinx.Audio/Native/libsoundio/libsoundio-interop.cs similarity index 100% rename from Third Party/libsoundio-sharp/libsoundio-interop.cs rename to Ryujinx.Audio/Native/libsoundio/libsoundio-interop.cs diff --git a/Ryujinx.Audio/Ryujinx.Audio.csproj b/Ryujinx.Audio/Ryujinx.Audio.csproj index 9a6f5f08bd..84b1469bf6 100644 --- a/Ryujinx.Audio/Ryujinx.Audio.csproj +++ b/Ryujinx.Audio/Ryujinx.Audio.csproj @@ -18,12 +18,23 @@ - - - - + + + PreserveNewest + libsoundio.dll + + + PreserveNewest + libsoundio.dylib + + + PreserveNewest + libsoundio.so + + + diff --git a/Ryujinx.sln b/Ryujinx.sln index 0b50ac6d51..148224faa4 100644 --- a/Ryujinx.sln +++ b/Ryujinx.sln @@ -23,10 +23,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Luea", "Ryujinx.LLE\Luea.cs EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Common", "Ryujinx.Common\Ryujinx.Common.csproj", "{5FD4E4F6-8928-4B3C-BE07-28A675C17226}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "libsoundio-sharp", "Third Party\libsoundio-sharp\libsoundio-sharp.csproj", "{E8B7DCD3-A2C8-4274-A260-BBBF1B842703}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Third Party", "Third Party", "{16D8E2A1-0D12-4315-945E-CABC15B3616D}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -73,17 +69,10 @@ Global {5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Debug|Any CPU.Build.0 = Debug|Any CPU {5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Release|Any CPU.ActiveCfg = Release|Any CPU {5FD4E4F6-8928-4B3C-BE07-28A675C17226}.Release|Any CPU.Build.0 = Release|Any CPU - {E8B7DCD3-A2C8-4274-A260-BBBF1B842703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8B7DCD3-A2C8-4274-A260-BBBF1B842703}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8B7DCD3-A2C8-4274-A260-BBBF1B842703}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8B7DCD3-A2C8-4274-A260-BBBF1B842703}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {E8B7DCD3-A2C8-4274-A260-BBBF1B842703} = {16D8E2A1-0D12-4315-945E-CABC15B3616D} - EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {110169B3-3328-4730-8AB0-BA05BEF75C1A} EndGlobalSection diff --git a/Third Party/libsoundio-sharp/.gitignore b/Third Party/libsoundio-sharp/.gitignore deleted file mode 100644 index caa8e2c1a8..0000000000 --- a/Third Party/libsoundio-sharp/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -*.userprefs -*.csproj.user -bin -obj -packages - diff --git a/Third Party/libsoundio-sharp/.gitversion b/Third Party/libsoundio-sharp/.gitversion deleted file mode 100644 index 230c1803b2..0000000000 --- a/Third Party/libsoundio-sharp/.gitversion +++ /dev/null @@ -1 +0,0 @@ -atsushieno/libsoundio-sharp#571569a566e973719b05cad2c2f9c239f423bb8f \ No newline at end of file diff --git a/Third Party/libsoundio-sharp/LICENSE b/Third Party/libsoundio-sharp/LICENSE deleted file mode 100644 index e8f202a53a..0000000000 --- a/Third Party/libsoundio-sharp/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -The MIT License - -Copyright (c) 2017 Atsushi Eno - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - diff --git a/Third Party/libsoundio-sharp/README.md b/Third Party/libsoundio-sharp/README.md deleted file mode 100644 index 82de73f06f..0000000000 --- a/Third Party/libsoundio-sharp/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# libsoundio-sharp - -libsoundio-sharp is a C# wrapper for [libsoundio](https://github.com/andrewrk/libsoundio) cross-platform audio I/O library. See what's cool at the website. Namely it is... - -- cross-platform among various desktop platforms (Windows/Mac/Linux). -- modern features (device detection, channel layouts) -- C-based easy bindable API - -.NET platforms lack cross-platform audio I/O solution and therefore C# is still not applied in this area. libsoundio-sharp is created to change it. - -libsoundio-sharp makes use of [nclang](https://github.com/atsushieno/nclang/) PInvokeGenerator. It is on top of completely generated code without any changes. - -libsoundio-sharp is verified to work on Mono on Linux, and supposed to work on .NET Framework and .NET Core. - -The library is provided under the MIT License. Samples are ported from libsoundio which is largely attributed to Andrew Kelley (the original libsoundio author). diff --git a/Third Party/libsoundio-sharp/libsoundio-sharp.csproj b/Third Party/libsoundio-sharp/libsoundio-sharp.csproj deleted file mode 100644 index 344f844a60..0000000000 --- a/Third Party/libsoundio-sharp/libsoundio-sharp.csproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - netstandard2.0 - true - - - - - - - - - - - - - - - - PreserveNewest - libsoundio.dll - - - PreserveNewest - libsoundio.dylib - - - PreserveNewest - libsoundio.so - - -