XAOnMemoryWaveSource で、xadec.dll ではなく libbjxa.dll でデコードするよう修正。

xadec.dll は不要になったので削除し、代わりに libbjxa.dll を追加。 LICENCE, NOTICE を追加。 System.Memory.dll を 4.5.2 に更新。
DTXMania · Jan 14, 2019 · 4d91e38 · 4d91e38
1 parent 43fc98b
commit 4d91e38
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 4 deletions.
diff --git a/DTXMania/DTXMania.csproj b/DTXMania/DTXMania.csproj
@@ -160,7 +160,7 @@
       <HintPath>..\packages\System.Data.SQLite.Linq.1.0.109.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>
+      <HintPath>..\packages\System.Memory.4.5.2\lib\netstandard2.0\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

diff --git a/DTXMania/packages.config b/DTXMania/packages.config
@@ -22,7 +22,7 @@
   <package id="System.Data.SQLite.Core" version="1.0.109.2" targetFramework="net471" />
   <package id="System.Data.SQLite.EF6" version="1.0.109.0" targetFramework="net471" />
   <package id="System.Data.SQLite.Linq" version="1.0.109.0" targetFramework="net471" />
-  <package id="System.Memory" version="4.5.1" targetFramework="net471" />
+  <package id="System.Memory" version="4.5.2" targetFramework="net471" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net471" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net471" />
   <package id="YamlDotNet" version="5.3.0" targetFramework="net471" />

diff --git a/FDK/FDK.csproj b/FDK/FDK.csproj
@@ -260,6 +260,10 @@
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="libbjxa.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/FDK/libbjxa.dll b/FDK/libbjxa.dll
diff --git a/FDK/メディア/サウンド/Sources/XAOnMemoryWaveSource.cs b/FDK/メディア/サウンド/Sources/XAOnMemoryWaveSource.cs
@@ -59,11 +59,12 @@ public XAOnMemoryWaveSource( VariablePath ファイルパス, WaveFormat deviceF
                 if( fs.Read( xabuf, 0, xabuf.Length ) != xabuf.Length )
                     throw new Exception( "xaデータの読み込みに失敗しました。" );
 
-                int ret = bjxa.Decode( xabuf, pcmbuf );
+                int ret = bjxa.Decode( xabuf, pcmbuf, out long pcm_data );
 
 
                 // Waveバッファに転送する。
                 this._DecodedWaveData = new byte[ pcmbuf.Length * 2 ];
+                //this._DecodedWaveData = new byte[ pcm_data * 2 ];   --> バッファが足りない
 
                 for( int i = 0; i < pcmbuf.Length; i++ )
                 {

diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 2019 ＦＲＯＭ/Kenji Yamazaki
+
+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/NOTICE b/NOTICE
@@ -0,0 +1,50 @@
+
+Redistributed binaries
+----------------------
+
+This product contains:
+
+.NET Core Libraries (CoreFX)
+    Copyright (c) .NET Foundation and Contributors
+    The MIT License (MIT)
+    https://github.com/dotnet/corefx/blob/master/LICENSE.TXT
+
+CSCore
+    Florian R.
+    Microsoft Public Licence (Ms-PL)
+    https://github.com/filoe/cscore/blob/master/license.md
+
+EntityFramework
+    Copyright (C) Microsoft Open Technologies, Inc.
+    Apache Licence, Version 2.0
+    https://github.com/aspnet/EntityFramework6/blob/master/License.txt
+
+bjxa - BandJAM XA audio codec
+    Copyright (C) 2018  Dridi Boukelmoune
+    GNU Lesser General Public License Version 2.1 (LGPLv2.1)
+    https://github.com/Dridi/bjxa/blob/master/lgpl-2.1.txt
+
+protobuf-net
+    Copyright 2008 Marc Gravell
+    Apache Licence, Version 2.0
+    https://github.com/mgravell/protobuf-net/blob/master/Licence.txt
+
+SharpDX
+    Copyright (c) 2010-2014 SharpDX - Alexandre Mutel
+    The MIT License (MIT)
+    https://github.com/sharpdx/SharpDX/blob/master/LICENSE
+
+System.Data.SQLite
+    SQLite Development Team
+    Public Domain
+    https://system.data.sqlite.org/index.html/doc/trunk/www/copyright.wiki
+
+Windows-API-Code-Pack
+    Microsoft
+    Micrsoft software Licence
+    https://github.com/contre/Windows-API-Code-Pack-1.1/blob/master/LICENSE
+
+YamlDotNet
+    Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Antoine Aubry and contributors
+    The MIT License (MIT)
+    https://github.com/aaubry/YamlDotNet/blob/master/LICENSE
diff --git a/README.md b/README.md
@@ -5,3 +5,6 @@
 * Windows 10 (latest)  ※ Windows 7/Vistaでは動作しません。
 * DirectX 11.0+
 * MIDI Input, Keyboard
+
+## ライセンス
+* MIT Licence