Merge branch 'develop'

.editorconfig

@@ -0,0 +1,8 @@
+[*]
+indent_style = tab
+
+# Code files
+[*.*]
+indent_size = 2
+insert_final_newline = true
+charset = utf-8-bom

CHANGELOG.md

@@ -0,0 +1,19 @@
+# [Changelog](http://keepachangelog.com/en/1.0.0/):
+
+## [Unreleased]
+
+
+
+## [v2.0.0.0] - *29.06.2020*
+
+### Added:
+
+- Added FMOD Studio support.
+
+### Changed:
+
+- Reworked the overall API.
+
+### Removed:
+
+- Removed `fmod.jar` from the Android library.

ChaiFoxes.FMODAudio/ChaiFoxes.FMODAudio.Android.Bindings/ChaiFoxes.FMODAudio.Android.Bindings.csproj → ChaiFoxes.FMODAudio.Demos/ChaiFoxes.FMODAudio.Demos.Android.Bindings/ChaiFoxes.FMODAudio.Demos.Android.Bindings.csproj

@@ -5,18 +5,20 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2546D47C-EEA5-41D3-8906-B28A3B819889}</ProjectGuid>
+    <ProjectGuid>{4B06ADDF-E4DC-4F8E-8A1A-0489BFC6A6B4}</ProjectGuid>
     <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TemplateGuid>{77efb91c-a7e9-4b0e-a7c5-31eeec3c6d46}</TemplateGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ChaiFoxes.FMODAudio.Android.Bindings</RootNamespace>
-    <AssemblyName>ChaiFoxes.FMODAudio.Android.Bindings</AssemblyName>
+    <RootNamespace>ChaiFoxes.FMODAudio.Demos.Android.Bindings</RootNamespace>
+    <AssemblyName>ChaiFoxes.FMODAudio.Demos.Android.Bindings</AssemblyName>
     <FileAlignment>512</FileAlignment>
+    <Deterministic>True</Deterministic>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
     <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -28,7 +30,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>

ChaiFoxes.FMODAudio/ChaiFoxes.FMODAudio.Android/Properties/AssemblyInfo.cs → ChaiFoxes.FMODAudio.Demos/ChaiFoxes.FMODAudio.Demos.Android.Bindings/Properties/AssemblyInfo.cs

@@ -6,11 +6,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("ChaiFoxes.FMODAudio.Android")]
+[assembly: AssemblyTitle("ChaiFoxes.FMODAudio.Demos.Android.Bindings")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ChaiFoxes.FMODAudio.Android")]
+[assembly: AssemblyProduct("ChaiFoxes.FMODAudio.Demos.Android.Bindings")]
 [assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -22,9 +22,5 @@
 //      Minor Version 
 //      Build Number
 //      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

ChaiFoxes.FMODAudio.Demos/ChaiFoxes.FMODAudio.Demos.Android/Activity1.cs

@@ -1,4 +1,4 @@
-using Android.App;
+using Android.App;
 using Android.Content.PM;
 using Android.OS;
 using Android.Views;
@@ -11,7 +11,7 @@ namespace ChaiFoxes.FMODAudio.Demos.Android
 			, Theme = "@style/Theme.Splash"
 			, AlwaysRetainTaskState = true
 			, LaunchMode = LaunchMode.SingleInstance
-			, ScreenOrientation = ScreenOrientation.FullUser
+			, ScreenOrientation = ScreenOrientation.Portrait
 			, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.Keyboard | ConfigChanges.KeyboardHidden | ConfigChanges.ScreenSize)]
 	public class Activity1 : Microsoft.Xna.Framework.AndroidGameActivity
 	{

ChaiFoxes.FMODAudio.Demos/ChaiFoxes.FMODAudio.Demos.Android/ChaiFoxes.FMODAudio.Demos.Android.csproj

@@ -45,10 +45,6 @@
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ChaiFoxes.FMODAudio.Android, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\ChaiFoxes.FMODAudio\ChaiFoxes.FMODAudio.Android\bin\Debug\ChaiFoxes.FMODAudio.Android.dll</HintPath>
-    </Reference>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
     <Reference Include="OpenTK-1.0" />
@@ -66,6 +62,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <AndroidNativeLibrary Include="libs\arm64-v8a\libfmodstudio.so" />
+    <AndroidNativeLibrary Include="libs\armeabi-v7a\libfmodstudio.so" />
+    <AndroidNativeLibrary Include="libs\x86\libfmodstudio.so" />
     <None Include="Resources\AboutResources.txt" />
     <None Include="Assets\AboutAssets.txt" />
   </ItemGroup>
@@ -93,9 +92,17 @@
   <ItemGroup>
     <AndroidNativeLibrary Include="libs\arm64-v8a\libfmod.so" />
     <AndroidNativeLibrary Include="libs\armeabi-v7a\libfmod.so" />
-    <AndroidNativeLibrary Include="libs\armeabi\libfmod.so" />
     <AndroidNativeLibrary Include="libs\x86\libfmod.so" />
-    <AndroidNativeLibrary Include="libs\x86_64\libfmod.so" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ChaiFoxes.FMODAudio\ChaiFoxes.FMODAudio.Android\ChaiFoxes.FMODAudio.Android.csproj">
+      <Project>{08d5910f-1ca1-4a7e-a3f7-354ff1b03858}</Project>
+      <Name>ChaiFoxes.FMODAudio.Android</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ChaiFoxes.FMODAudio.Demos.Android.Bindings\ChaiFoxes.FMODAudio.Demos.Android.Bindings.csproj">
+      <Project>{4b06addf-e4dc-4f8e-8a1a-0489bfc6a6b4}</Project>
+      <Name>ChaiFoxes.FMODAudio.Demos.Android.Bindings</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="..\ChaiFoxes.FMODAudio.Demos\ChaiFoxes.FMODAudio.Demos.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />

ChaiFoxes.FMODAudio.Demos/ChaiFoxes.FMODAudio.Demos.Desktop/ChaiFoxes.FMODAudio.Demos.Desktop.csproj

@@ -13,7 +13,7 @@
     <AssemblyName>ChaiFoxes.FMODAudio.Demos.Desktop</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MonoGamePlatform>DesktopGL</MonoGamePlatform>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -62,9 +62,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="ChaiFoxes.FMODAudio.Desktop">
-      <HintPath>..\..\ChaiFoxes.FMODAudio\ChaiFoxes.FMODAudio.Desktop\bin\Debug\ChaiFoxes.FMODAudio.Desktop.dll</HintPath>
-    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\MonoGame.Framework.dll</HintPath>
     </Reference>
@@ -128,7 +125,16 @@
     <None Include="x64\libfmod.so.11">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="x64\libfmod.so.11.0">
+    <None Include="x64\libfmod.so.11.8">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="x64\libfmodstudio.so">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="x64\libfmodstudio.so.11">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="x64\libfmodstudio.so.11.8">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="x86\libfmod.so">
@@ -137,7 +143,16 @@
     <None Include="x86\libfmod.so.11">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="x86\libfmod.so.11.0">
+    <None Include="x86\libfmod.so.11.8">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="x86\libfmodstudio.so">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="x86\libfmodstudio.so.11">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="x86\libfmodstudio.so.11.8">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
@@ -160,9 +175,21 @@
     <Content Include="x64\fmod.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="x64\fmodstudio.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="x86\fmod.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="x86\fmodstudio.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ChaiFoxes.FMODAudio\ChaiFoxes.FMODAudio.Desktop\ChaiFoxes.FMODAudio.Desktop.csproj">
+      <Project>{f712bf21-58f9-448c-bef5-286cec991ebb}</Project>
+      <Name>ChaiFoxes.FMODAudio.Desktop</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="..\ChaiFoxes.FMODAudio.Demos\ChaiFoxes.FMODAudio.Demos.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

ChaiFoxes.FMODAudio.Demos/ChaiFoxes.FMODAudio.Demos.Desktop/app.config

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>

ChaiFoxes.FMODAudio.Demos/ChaiFoxes.FMODAudio.Demos.Windows/ChaiFoxes.FMODAudio.Demos.Windows.csproj

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0144A105-BAD8-4EE2-9254-53A02643E360}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ChaiFoxes.FMODAudio.Demos.Windows</RootNamespace>
+    <AssemblyName>ChaiFoxes.FMODAudio.Demos.Windows</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MonoGamePlatform>Windows</MonoGamePlatform>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\$(MonoGamePlatform)\$(Platform)\$(Configuration)\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;WINDOWS</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\$(MonoGamePlatform)\$(Platform)\$(Configuration)\</OutputPath>
+    <DefineConstants>TRACE;WINDOWS</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Icon.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="MonoGame.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Windows\MonoGame.Framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Icon.ico" />
+    <Content Include="x64\fmod.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x64\fmodstudio.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x86\fmod.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x86\fmodstudio.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.manifest" />
+  </ItemGroup>
+  <ItemGroup>
+    <MonoGameContentReference Include="..\ChaiFoxes.FMODAudio.Demos\Content\Content.mgcb" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ChaiFoxes.FMODAudio\ChaiFoxes.FMODAudio.Desktop\ChaiFoxes.FMODAudio.Desktop.csproj">
+      <Project>{f712bf21-58f9-448c-bef5-286cec991ebb}</Project>
+      <Name>ChaiFoxes.FMODAudio.Desktop</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="..\ChaiFoxes.FMODAudio.Demos\ChaiFoxes.FMODAudio.Demos.projitems" Label="Shared" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Content.Builder.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>