OSDN Git Service

#38865 xadec.dll の代わりに、libbjxa.dll を採用。
authoryyagi <yyagi.dtxmania@gmail.com>
Mon, 14 Jan 2019 12:43:00 +0000 (21:43 +0900)
committeryyagi <yyagi.dtxmania@gmail.com>
Mon, 14 Jan 2019 12:43:00 +0000 (21:43 +0900)
これに伴い、ライセンス情報の追加並びに終了画面の更新も併せて行った。
なお、xadec.dll は削除したため、これがないと動作しないDTXV.exeも削除した。

14 files changed:
DTXMania.sln
DTXMania/作成資料/終了画面.psd
FDK/FDK.csproj
FDK/コード/03.サウンド/Cxa.cs
RuntimeResources/DTXV.exe [deleted file]
RuntimeResources/Licenses/lgpl-2.1(libbjxa).txt [new file with mode: 0644]
RuntimeResources/Licenses/libbjxa.txt [new file with mode: 0644]
RuntimeResources/Licenses/xadec.txt [deleted file]
RuntimeResources/System/Default/Graphics/ScreenExit background.jpg
RuntimeResources/dll/libbjxa.dll [new file with mode: 0644]
RuntimeResources/xadec.dll [deleted file]
libbjxa/Properties/AssemblyInfo.cs [new file with mode: 0644]
libbjxa/libbjxa.cs [new file with mode: 0644]
libbjxa/libbjxa.csproj [new file with mode: 0644]

index 002c9fb..6c82f42 100644 (file)
@@ -10,9 +10,14 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTXCreator", "DTXCreator\DTXCreator.csproj", "{BAC81BCC-5689-4600-91A0-7427667500D6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTX2WAV", "DTX2WAV\DTX2WAV.csproj", "{97942C23-C771-440E-9D07-897C9EF9BED5}"
+       ProjectSection(ProjectDependencies) = postProject
+               {81BEC512-8074-4BD1-8A3C-AC73BC7BF846} = {81BEC512-8074-4BD1-8A3C-AC73BC7BF846}
+       EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MidiInChecker2", "MidiInChecker2_Solution\MidiInChecker2_Project\MidiInChecker2.csproj", "{46AC7786-9431-4C49-B18E-9B6A839B6E5A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libbjxa", "libbjxa\libbjxa.csproj", "{41E67409-F5EC-4216-A790-2519A7B22E51}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Any CPU = Debug|Any CPU
@@ -55,6 +60,14 @@ Global
                {46AC7786-9431-4C49-B18E-9B6A839B6E5A}.Release|Any CPU.Build.0 = Debug|Any CPU
                {46AC7786-9431-4C49-B18E-9B6A839B6E5A}.Release|x86.ActiveCfg = Release|Any CPU
                {46AC7786-9431-4C49-B18E-9B6A839B6E5A}.Release|x86.Build.0 = Release|Any CPU
+               {41E67409-F5EC-4216-A790-2519A7B22E51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {41E67409-F5EC-4216-A790-2519A7B22E51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {41E67409-F5EC-4216-A790-2519A7B22E51}.Debug|x86.ActiveCfg = Debug|Any CPU
+               {41E67409-F5EC-4216-A790-2519A7B22E51}.Debug|x86.Build.0 = Debug|Any CPU
+               {41E67409-F5EC-4216-A790-2519A7B22E51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {41E67409-F5EC-4216-A790-2519A7B22E51}.Release|Any CPU.Build.0 = Release|Any CPU
+               {41E67409-F5EC-4216-A790-2519A7B22E51}.Release|x86.ActiveCfg = Release|Any CPU
+               {41E67409-F5EC-4216-A790-2519A7B22E51}.Release|x86.Build.0 = Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index d91ebf1..ac401f8 100644 (file)
Binary files a/DTXMania/作成資料/終了画面.psd and b/DTXMania/作成資料/終了画面.psd differ
index ff2ef64..c9dbbd7 100644 (file)
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libbjxa\libbjxa.csproj">
+      <Project>{41e67409-f5ec-4216-a790-2519a7b22e51}</Project>
+      <Name>libbjxa</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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.
index ee239fe..302d362 100644 (file)
@@ -9,93 +9,29 @@ using System.Threading;
 
 namespace FDK
 {
-       public unsafe class Cxa : SoundDecoder  //, IDisposable
+       public unsafe class Cxa : SoundDecoder    //, IDisposable
        {
-               static byte[] FOURCC = Encoding.ASCII.GetBytes( "1DWK" );       // KWD1 の little endian
+               //static byte[] FOURCC = Encoding.ASCII.GetBytes("1DWK"); // KWD1 (little endian)
 
-               #region [ XA用構造体の宣言 ]
-               [StructLayout(LayoutKind.Sequential)]
-               public struct XASTREAMHEADER {
-                       public byte* pSrc;
-                       public uint nSrcLen;
-                       public uint nSrcUsed;
-                       public byte* pDst;
-                       public uint nDstLen;
-                       public uint nDstUsed;
-               }
-
-               [StructLayout( LayoutKind.Sequential )]
-               public struct XAHEADER
-               {
-                       public uint id;
-                       public uint nDataLen;
-                       public uint nSamples;
-                       public ushort nSamplesPerSec;
-                       public byte nBits;
-                       public byte nChannels;
-                       public uint nLoopPtr;
-                       [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-                       public short[] befL;
-                       [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-                       public short[] befR;
-                       [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-                       public byte[] pad;
-               }
-               #endregion
-
-               #region [ xadec.dllとのリンク ]
-               [DllImport( "xadec.dll", EntryPoint = "xaDecodeOpen", CallingConvention = CallingConvention.Cdecl )]
-               public extern static IntPtr xaDecodeOpen( ref XAHEADER pxah, out FDK.CWin32.WAVEFORMATEX pwfx );
-               [DllImport( "xadec.dll", EntryPoint = "xaDecodeClose", CallingConvention = CallingConvention.Cdecl )]
-               public extern static bool xaDecodeClose( IntPtr hxas );
-               [DllImport( "xadec.dll", EntryPoint = "xaDecodeSize", CallingConvention = CallingConvention.Cdecl )]
-               public extern static bool xaDecodeSize( IntPtr hxas, uint slen, out uint pdlen );
-               [DllImport( "xadec.dll", EntryPoint = "xaDecodeConvert", CallingConvention = CallingConvention.Cdecl )]
-               public extern static bool xaDecodeConvert( IntPtr hxas, ref XASTREAMHEADER psh );
-               #endregion
-
-               public XAHEADER xaheader;
-               public XASTREAMHEADER xastreamheader;
                public CWin32.WAVEFORMATEX waveformatex;
 
                private string filename;
                private byte[] srcBuf = null;
-               private int nHandle = -1;
+               //private int nHandle = -1;
+               private bjxa.Decoder bjxa = new bjxa.Decoder();
+               private bjxa.Format format = null;
+               private FileStream fs;
 
-               public override int Open( string filename )
+               public override int Open(string filename)
                {
                        this.filename = filename;
 
-                       #region [ XAヘッダと、XAデータの読み出し  ]
-                       xaheader = new XAHEADER();
-                       using ( FileStream fs = new FileStream( filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite ) )       // FileShare を付けとかないと、Close() 後もロックがかかる??
-                       {
-                               using ( BinaryReader br = new BinaryReader( fs ) )
-                               {
-                                       xaheader.id = br.ReadUInt32();
-                                       xaheader.nDataLen = br.ReadUInt32();
-                                       xaheader.nSamples = br.ReadUInt32();
-                                       xaheader.nSamplesPerSec = br.ReadUInt16();
-                                       xaheader.nBits = br.ReadByte();
-                                       xaheader.nChannels = br.ReadByte();
-                                       xaheader.nLoopPtr = br.ReadUInt32();
-
-                                       xaheader.befL = new short[ 2 ];
-                                       xaheader.befR = new short[ 2 ];
-                                       xaheader.pad = new byte[ 4 ];
-
-                                       xaheader.befL[ 0 ] = br.ReadInt16();
-                                       xaheader.befL[ 1 ] = br.ReadInt16();
-                                       xaheader.befR[ 0 ] = br.ReadInt16();
-                                       xaheader.befR[ 1 ] = br.ReadInt16();
-                                       xaheader.pad = br.ReadBytes( 4 );
-
-                                       srcBuf = new byte[ xaheader.nDataLen ];
-                                       srcBuf = br.ReadBytes( (int) xaheader.nDataLen );
-                               }
-                       }
+                       #region [ Reading XA headers, then store it ]
+                       fs = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);   // Need to set FileShare flag, to avoid locking after Closer()
+                       format = bjxa.ReadHeader(fs);
                        //string xaid = Encoding.ASCII.GetString( xah.id );
-                       #region [ デバッグ表示 ]
+
+                       #region [ Debug info ]
                        //Debug.WriteLine( "**XAHEADER**" );
                        //Debug.WriteLine( "id=             " + xaheader.id.ToString( "X8" ) );
                        //Debug.WriteLine( "nDataLen=       " + xaheader.nDataLen.ToString( "X8" ) );
@@ -111,18 +47,19 @@ namespace FDK
                        #endregion
                        #endregion
 
-                       IntPtr hxas;
 
-                       #region [ WAVEFORMEX情報の取得  ]
+                       #region [ Getting WAVEFORMEX info ]
                        waveformatex = new CWin32.WAVEFORMATEX();
-                       hxas = xaDecodeOpen( ref xaheader, out waveformatex );
-                       if ( hxas == null )
-                       {
-                               Trace.TraceError( "Error: xa: Open(): xaDecodeOpen(): " + Path.GetFileName( filename ) );
-                               return -1;
-                       }
 
-                       #region [ デバッグ表示 ]
+                       waveformatex.wFormatTag = (ushort)format.WaveFormatPcm;
+                       waveformatex.nChannels = (ushort)format.Channels;
+                       waveformatex.nSamplesPerSec = format.SamplesRate;
+                       waveformatex.nAvgBytesPerSec = format.WaveByteRate;
+                       waveformatex.nBlockAlign = (ushort)format.WaveBlockAlign;
+                       waveformatex.wBitsPerSample = (ushort)format.SampleBits;
+                       waveformatex.cbSize = 0;
+
+                       #region [ Debug info ]
                        //Debug.WriteLine( "**WAVEFORMATEX**" );
                        //Debug.WriteLine( "wFormatTag=      " + waveformatex.wFormatTag.ToString( "X4" ) );
                        //Debug.WriteLine( "nChannels =      " + waveformatex.nChannels.ToString( "X4" ) );
@@ -134,28 +71,26 @@ namespace FDK
                        #endregion
                        #endregion
 
-                       this.nHandle = (int) hxas;
-                       return (int) hxas;
+                       return 0x7FFFFFFF;  // Anyway, return non-zero value
                }
-               public override int GetFormat( int nHandle, ref CWin32.WAVEFORMATEX wfx )
+               public override int GetFormat(int nHandle, ref CWin32.WAVEFORMATEX wfx)
                {
-                       #region [ WAVEFORMATEX構造体の手動コピー ]
+                       #region [ Copying WAVEFORMATEX structure data ]
                        wfx.nAvgBytesPerSec = waveformatex.nAvgBytesPerSec;
-                       wfx.wBitsPerSample  =  waveformatex.wBitsPerSample;
-                       wfx.nBlockAlign     =  waveformatex.nBlockAlign;
-                       wfx.nChannels       =  waveformatex.nChannels;
-                       wfx.wFormatTag      = waveformatex.wFormatTag;
-                       wfx.nSamplesPerSec  = waveformatex.nSamplesPerSec;
+                       wfx.wBitsPerSample = waveformatex.wBitsPerSample;
+                       wfx.nBlockAlign = waveformatex.nBlockAlign;
+                       wfx.nChannels = waveformatex.nChannels;
+                       wfx.wFormatTag = waveformatex.wFormatTag;
+                       wfx.nSamplesPerSec = waveformatex.nSamplesPerSec;
 
                        return 0;
                        #endregion
                }
-               public override uint GetTotalPCMSize( int nHandle )
+               public override uint GetTotalPCMSize(int nHandle)
                {
-                       #region [ データ長の取得 ]
-                       uint dlen;
-                       xaDecodeSize( (IntPtr) nHandle, xaheader.nDataLen, out dlen );
-                       #region [ デバッグ表示 ]
+                       #region [ Getting PCM length ]
+                       uint dlen = (uint)format.DataLengthPcm;
+                       #region [ Debug info ]
                        //Debug.WriteLine( "**INTERNAL VALUE**" );
                        //Debug.WriteLine( "dlen=          " + dlen );
                        #endregion
@@ -163,34 +98,44 @@ namespace FDK
 
                        return dlen;
                }
-               public override int Seek( int nHandle, uint dwPosition )
+               public override int Seek(int nHandle, uint dwPosition)
                {
                        return 0;
                }
-               public override int Decode( int nHandle, IntPtr pDest, uint szDestSize, int bLoop )
+               public override int Decode(int nHandle, IntPtr pDest, uint szDestSize, int bLoop)
                {
-                       #region [ xaデータのデコード ]
-                       xastreamheader = new XASTREAMHEADER();
-                       unsafe
-                       {
-                               fixed ( byte* pXaBuf = srcBuf )
-                               {
-                                       byte* pWavBuf = (byte*) pDest;
+                       #region [ Decodig xa data ]
+                       srcBuf = new byte[format.Blocks * format.BlockSizeXa];
+                       var pcmbuf = new short[format.Blocks * format.BlockSizePcm];
 
-                                       xastreamheader.pSrc = pXaBuf;
-                                       xastreamheader.nSrcLen = xaheader.nDataLen;
-                                       xastreamheader.nSrcUsed = 0;
-                                       xastreamheader.pDst = pWavBuf;
-                                       xastreamheader.nDstLen = szDestSize;
-                                       xastreamheader.nDstUsed = 0;
-                                       if ( !xaDecodeConvert( (IntPtr) nHandle, ref xastreamheader ) )
-                                       {
-                                               Trace.TraceError( "Error: xaDecodeConvert(): " + Path.GetFileName( filename ) );
-                                               return -1;
-                                       }
-                               }
+                       if (fs.Read(srcBuf, 0, srcBuf.Length) != srcBuf.Length)
+                       {
+                               string s = Path.GetFileName(filename);
+                               throw new Exception( $"Failed to load xa data: {s}");
                        }
-                       #region [ デバッグ表示 ]
+                       int ret = bjxa.Decode(srcBuf, pcmbuf, out long pcmBufLength);
+
+                       Marshal.Copy(pcmbuf, 0, pDest, (int)format.DataLengthPcm/2);
+
+                       #region [ alternative copy way ]
+                       // if you can't use Marshal.Copy, try this.
+                       //unsafe
+                       //{
+                       //      short* pWavBuf = (short*)pDest;
+                       //      for (int i = 0; i < format.DataLengthPcm/2; i++)
+                       //      {
+                       //              *pWavBuf++ = pcmbuf[i];
+                       //      }
+                       //}
+                       #endregion
+
+                       //string shortpath = Path.GetFileName(filename);
+                       //Trace.TraceInformation($"libbjxa: decode succeeded: {shortpath} = {szDestSize}");
+
+                       srcBuf = null;
+                       pcmbuf = null;
+
+                       #region [ Debug info ]
                        //Debug.WriteLine( "**XASTREAMHEADER**" );
                        //Debug.WriteLine( "nSrcLen=  " + xastreamheader.nSrcLen );
                        //Debug.WriteLine( "nSrcUsed= " + xastreamheader.nSrcUsed );
@@ -201,180 +146,42 @@ namespace FDK
 
                        return 0;
                }
-               public override void Close( int nHandle )
+               public override void Close(int nHandle)
                {
-                       #region [ xaファイルのクローズ ]
-                       if ( !xaDecodeClose( (IntPtr) nHandle ) )
-                       {
-                               Trace.TraceError( "Error: xaDecodeClose(): " + Path.GetFileName( filename ) );
-                       }
-                       srcBuf = null;
-                       #endregion
+                       fs.Close();
                }
 
 
 
-               //#region [ IDisposable 実装 ]
-               ////-----------------
-               //private bool bDispose完了済み = false;
-               //public void Dispose()
-               //{
-               //    if ( !this.bDispose完了済み )
-               //    {
-               //        if ( srcBuf != null )
-               //        {
-               //            srcBuf = null;
-               //        }
-               //        if ( dstBuf != null )
-               //        {
-               //            dstBuf = null;
-               //        }
-
-               //        if ( this.nHandle >= 0 )
-               //        {
-               //            this.Close( this.nHandle );
-               //            this.nHandle = -1;
-               //        }
-               //        this.bDispose完了済み = true;
-               //    }
-               //}
-               ////-----------------
-               //#endregion
+               #region [ IDisposable implementatitons ]
+               //-----------------
+               private bool bDisposed = false;
 
-#if false
-               /// <summary>
-               /// xaファイルを読み込んで、wavにdecodeする
-               /// </summary>
-               /// <param name="filename">xaファイル名</param>
-               /// <param name="wavBuf">wavファイルが格納されるバッファ</param>
-               /// <returns></returns>
-               public bool Decode( string filename, out byte[] wavBuf )
+               // Public implementation of Dispose pattern callable by consumers.
+               public void Dispose()
                {
-                       // Debug.WriteLine( "xa: Decode: " + Path.GetFileName( filename ) );
-
-                       #region [ XAヘッダと、XAデータの読み出し  ]
-                       xaheader = new XAHEADER();
-                       byte[] xaBuf;
-                       using ( FileStream fs = new FileStream( filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite ) )       // FileShare を付けとかないと、Close() 後もロックがかかる??
-                       {
-                               using ( BinaryReader br = new BinaryReader( fs ) )
-                               {
-                                       xaheader.id = br.ReadUInt32();
-                                       xaheader.nDataLen = br.ReadUInt32();
-                                       xaheader.nSamples = br.ReadUInt32();
-                                       xaheader.nSamplesPerSec = br.ReadUInt16();
-                                       xaheader.nBits = br.ReadByte();
-                                       xaheader.nChannels = br.ReadByte();
-                                       xaheader.nLoopPtr = br.ReadUInt32();
-
-                                       xaheader.befL = new short[ 2 ];
-                                       xaheader.befR = new short[ 2 ];
-                                       xaheader.pad = new byte[ 4 ];
+                       Dispose(true);
+                       GC.SuppressFinalize(this);
+               }
 
-                                       xaheader.befL[ 0 ] = br.ReadInt16();
-                                       xaheader.befL[ 1 ] = br.ReadInt16();
-                                       xaheader.befR[ 0 ] = br.ReadInt16();
-                                       xaheader.befR[ 1 ] = br.ReadInt16();
-                                       xaheader.pad = br.ReadBytes( 4 );
+               // Protected implementation of Dispose pattern.
+               protected virtual void Dispose(bool disposing)
+               {
+                       if (this.bDisposed)
+                               return;
 
-                                       xaBuf = new byte[ xaheader.nDataLen ];
-                                       xaBuf = br.ReadBytes( (int) xaheader.nDataLen );
-                               }
-                       }
-                       //string xaid = Encoding.ASCII.GetString( xah.id );
-                       #region [ デバッグ表示 ]
-                       //Debug.WriteLine( "**XAHEADER**" );
-                       //Debug.WriteLine( "id=             " + xaheader.id.ToString( "X8" ) );
-                       //Debug.WriteLine( "nDataLen=       " + xaheader.nDataLen.ToString( "X8" ) );
-                       //Debug.WriteLine( "nSamples=       " + xaheader.nSamples.ToString( "X8" ) );
-                       //Debug.WriteLine( "nSamplesPerSec= " + xaheader.nSamplesPerSec.ToString( "X4" ) );
-                       //Debug.WriteLine( "nBits=          " + xaheader.nBits.ToString( "X2" ) );
-                       //Debug.WriteLine( "nChannels=      " + xaheader.nChannels.ToString( "X2" ) );
-                       //Debug.WriteLine( "nLoopPtr=       " + xaheader.nLoopPtr.ToString( "X8" ) );
-                       //Debug.WriteLine( "befL[0]=        " + xaheader.befL[ 0 ].ToString( "X4" ) );
-                       //Debug.WriteLine( "befL[1]=        " + xaheader.befL[ 1 ].ToString( "X4" ) );
-                       //Debug.WriteLine( "befR[0]=        " + xaheader.befR[ 0 ].ToString( "X4" ) );
-                       //Debug.WriteLine( "befR[1]=        " + xaheader.befR[ 1 ].ToString( "X4" ) );
-                       #endregion
-                       #endregion
+                       if (srcBuf != null) srcBuf = null;
+                       if (bjxa != null) bjxa = null;
 
-                       object lockobj = new object();
-                       lock ( lockobj )        // スレッドセーフじゃないかも知れないので、念のため
+                       if (disposing)
                        {
-                               #region [ WAVEFORMEX情報の取得  ]
-                               waveformatex = new CWin32.WAVEFORMATEX();
-                               IntPtr hxas = xaDecodeOpen( ref xaheader, out waveformatex );
-                               if ( hxas == null )
-                               {
-                                       Trace.TraceError( "Error: xaDecodeOpen(): " + Path.GetFileName( filename ) );
-                                       wavBuf = null;
-                                       return false;
-                               }
-
-                               #region [ デバッグ表示 ]
-                               //Debug.WriteLine( "**WAVEFORMATEX**" );
-                               //Debug.WriteLine( "wFormatTag=      " + waveformatex.wFormatTag.ToString( "X4" ) );
-                               //Debug.WriteLine( "nChannels =      " + waveformatex.nChannels.ToString( "X4" ) );
-                               //Debug.WriteLine( "nSamplesPerSec=  " + waveformatex.nSamplesPerSec.ToString( "X8" ) );
-                               //Debug.WriteLine( "nAvgBytesPerSec= " + waveformatex.nAvgBytesPerSec.ToString( "X8" ) );
-                               //Debug.WriteLine( "nBlockAlign=     " + waveformatex.nBlockAlign.ToString( "X4" ) );
-                               //Debug.WriteLine( "wBitsPerSample=  " + waveformatex.wBitsPerSample.ToString( "X4" ) );
-                               //Debug.WriteLine( "cbSize=          " + waveformatex.cbSize.ToString( "X4" ) );
-                               #endregion
-                               #endregion
-
-                               #region [ データ長の取得 ]
-                               uint dlen;
-                               xaDecodeSize( hxas, xaheader.nDataLen, out dlen );
-                               #region [ デバッグ表示 ]
-                               //Debug.WriteLine( "**INTERNAL VALUE**" );
-                               //Debug.WriteLine( "dlen=          " + dlen );
-                               #endregion
-                               #endregion
-
-                               #region [ xaデータのデコード ]
-                               wavBuf = new byte[ dlen ];
-                               xastreamheader = new XASTREAMHEADER();
-
-                               unsafe
-                               {
-                                       fixed ( byte* pXaBuf = xaBuf, pWavBuf = wavBuf )
-                                       {
-                                               xastreamheader.pSrc = pXaBuf;
-                                               xastreamheader.nSrcLen = xaheader.nDataLen;
-                                               xastreamheader.nSrcUsed = 0;
-                                               xastreamheader.pDst = pWavBuf;
-                                               xastreamheader.nDstLen = dlen;
-                                               xastreamheader.nDstUsed = 0;
-                                               bool b = xaDecodeConvert( hxas, ref xastreamheader );
-                                               if ( !b )
-                                               {
-                                                   Trace.TraceError( "Error: xaDecodeConvert(): " + Path.GetFileName( filename ) );
-                                                       wavBuf = null;
-                                                       return false;
-                                               }
-                                       }
-                               }
-                               #region [ デバッグ表示 ]
-                               //Debug.WriteLine( "**XASTREAMHEADER**" );
-                               //Debug.WriteLine( "nSrcLen=  " + xastreamheader.nSrcLen );
-                               //Debug.WriteLine( "nSrcUsed= " + xastreamheader.nSrcUsed );
-                               //Debug.WriteLine( "nDstLen=  " + xastreamheader.nDstLen );
-                               //Debug.WriteLine( "nDstUsed= " + xastreamheader.nDstUsed );
-                               #endregion
-                               #endregion
-
-                               #region [ xaファイルのクローズ ]
-                               bool bb = xaDecodeClose( hxas );
-                               if ( !bb )
-                               {
-                                       Trace.TraceError( "Error: xaDecodeClose(): " + Path.GetFileName( filename ) );
-                               }
-                               #endregion
+                               fs.Dispose();
                        }
 
-                       return true;
+                       this.bDisposed = true;
                }
-#endif
+
+               //-----------------
+               #endregion
        }
 }
diff --git a/RuntimeResources/DTXV.exe b/RuntimeResources/DTXV.exe
deleted file mode 100644 (file)
index 5feb5f4..0000000
Binary files a/RuntimeResources/DTXV.exe and /dev/null differ
diff --git a/RuntimeResources/Licenses/lgpl-2.1(libbjxa).txt b/RuntimeResources/Licenses/lgpl-2.1(libbjxa).txt
new file mode 100644 (file)
index 0000000..f166cc5
--- /dev/null
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+\f
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+\f
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+\f
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+\f
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+\f
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+\f
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+\f
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+\f
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+\f
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
\ No newline at end of file
diff --git a/RuntimeResources/Licenses/libbjxa.txt b/RuntimeResources/Licenses/libbjxa.txt
new file mode 100644 (file)
index 0000000..cb9577f
--- /dev/null
@@ -0,0 +1,21 @@
+/*-
+ * Copyright (C) 2018-2019  Dridi Boukelmoune
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alternatively, you can also redistribute this library and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of either License along with this
+ * program.  If not, see <http://www.gnu.org/licenses/>.
+ */
diff --git a/RuntimeResources/Licenses/xadec.txt b/RuntimeResources/Licenses/xadec.txt
deleted file mode 100644 (file)
index 7437f23..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-\r
-\81¡\8dÄ\94z\95z\82É\82Â\82¢\82Ä\r
-\81@\82±\82ÌDLL\82ð\8eg\97p\82µ\82Ä\82¢\82é\81u\83t\83\8a\81[\83\\83t\83g\83E\83F\83A\81v\82É\8cÀ\82è\81Axadec.dll\92P\91Ì\82ð\r
-\81@\91g\82Ý\8d\9e\82ñ\82Å\82Ì\94z\95z\82ð\8b\96\89Â\82µ\82Ü\82·\81B\r
-\81@\8es\94Ì\83\\83t\83g\82â\83V\83F\83A\83E\83F\83A\82È\82Ç\82É\82Í\90â\91Î\82É\91g\82Ý\8d\9e\82Ü\82È\82¢\82Å\82­\82¾\82³\82¢\81B\r
-\r
-\81¡\96Æ\90Ó\r
-\81@\82±\82Ì\83v\83\8d\83O\83\89\83\80\82Í\96³\95Û\8fØ\82Å\82·\81B\r
-\81@\93\96DLL\82ð\8eg\97p\82µ\82Ä\94­\90\82µ\82½\94@\89½\82È\82é\95s\8bï\8d\87\82à\82±\82¿\82ç\82Í\88ê\90Ø\90Ó\94C\82ð\8e\9d\82¿\82©\82Ë\82Ü\82·\81B\r
-\r
-\81¡\98A\97\8d\90æ\r
-\81@http://www.bandjam.net/\r
-\81@\92\86\96\90i\88ê(webmaster@bandjam.net)\r
index 26034ad..51215b5 100644 (file)
Binary files a/RuntimeResources/System/Default/Graphics/ScreenExit background.jpg and b/RuntimeResources/System/Default/Graphics/ScreenExit background.jpg differ
diff --git a/RuntimeResources/dll/libbjxa.dll b/RuntimeResources/dll/libbjxa.dll
new file mode 100644 (file)
index 0000000..2477c80
Binary files /dev/null and b/RuntimeResources/dll/libbjxa.dll differ
diff --git a/RuntimeResources/xadec.dll b/RuntimeResources/xadec.dll
deleted file mode 100644 (file)
index a415cdb..0000000
Binary files a/RuntimeResources/xadec.dll and /dev/null differ
diff --git a/libbjxa/Properties/AssemblyInfo.cs b/libbjxa/Properties/AssemblyInfo.cs
new file mode 100644 (file)
index 0000000..a46a845
--- /dev/null
@@ -0,0 +1,44 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+//
+// 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("libbjxa")]
+[assembly: AssemblyDescription("BandJAM XA audio codec")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("libbjxa")]
+[assembly: AssemblyCopyright("Copyright © 2018-2019 Dridi Boukelmoune")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+//
+// Use the attributes below to control the COM visibility of your assembly. By
+// default the entire assembly is visible to COM. Setting ComVisible to false
+// is the recommended default for your assembly. To then expose a class and interface
+// to COM set ComVisible to true on each one. It is also recommended to add a
+// Guid attribute.
+//
+[assembly: ComVisible(false)]
+
+// このプロジェクトが COM に公開される場合、次の GUID が typelib の ID になります
+[assembly: Guid("6ac65b96-bb61-48f7-a5d9-fe0288c1c02f")]
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+//[assembly: AssemblyVersion("0.3.0.0")]
+[assembly: AssemblyFileVersion("0.3.0.0")]
+
diff --git a/libbjxa/libbjxa.cs b/libbjxa/libbjxa.cs
new file mode 100644 (file)
index 0000000..890e207
--- /dev/null
@@ -0,0 +1,567 @@
+/*-
+ * Copyright (C) 2018-2019  Dridi Boukelmoune
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alternatively, you can also redistribute this library and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of either License along with this
+ * program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using System;
+using System.IO;
+using System.Reflection;
+
+using static System.Diagnostics.Debug;
+
+[assembly: AssemblyVersionAttribute("0.0")]
+
+namespace bjxa
+{
+
+       internal static class LittleEndian
+       {
+               private static uint Read(byte[] buf, int off, int len)
+               {
+                       Assert(buf != null);
+                       Assert(off >= 0);
+                       Assert(len > 0);
+                       Assert(off + len / 8 <= buf.Length);
+
+                       uint res = 0;
+                       int shl = 0;
+                       while (len > 0)
+                       {
+                               res += (uint)buf[off] << shl;
+                               shl += 8;
+                               len -= 8;
+                               off++;
+                       }
+
+                       return (res);
+               }
+
+               internal static short ReadShort(byte[] buf, int off)
+               {
+                       return ((short)ReadUShort(buf, off));
+               }
+
+               internal static ushort ReadUShort(byte[] buf, int off)
+               {
+                       return ((ushort)Read(buf, off, 16));
+               }
+
+               internal static uint ReadUInt(byte[] buf, int off)
+               {
+                       return (Read(buf, off, 32));
+               }
+
+               internal static void Write(byte[] buf, int off, long val,
+                       int len)
+               {
+                       Write(buf, off, (ulong)val, len);
+               }
+
+               internal static void Write(byte[] buf, int off, ulong val,
+                       int len)
+               {
+                       Assert(buf != null);
+                       Assert(off >= 0);
+                       Assert(len > 0);
+                       Assert(off + len / 8 <= buf.Length);
+
+                       while (len > 0)
+                       {
+                               buf[off] = (byte)val;
+                               val >>= 8;
+                               len -= 8;
+                               off++;
+                       }
+               }
+       }
+
+       public class Format
+       {
+               public const int HEADER_SIZE_XA = 32;
+               public const int HEADER_SIZE_RIFF = 44;
+
+               internal const uint HEADER_MAGIC = 0x3144574b;
+               internal const uint BLOCK_SAMPLES = 32;
+               internal const uint WAVE_HEADER_LEN = 16;
+               internal const ushort WAVE_FORMAT_PCM = 1;
+
+               public long DataLengthPcm;
+               public long Blocks;
+               public uint BlockSizePcm;
+               public uint BlockSizeXa;
+               public ushort SamplesRate;
+               public uint SampleBits;
+               public uint Channels;
+
+               public uint BlockSamples
+               {
+                       get { return (BLOCK_SAMPLES * Channels); }
+               }
+
+               public long RiffHeaderLength
+               {
+                       get { return (HEADER_SIZE_RIFF - 8 + DataLengthPcm); }
+               }
+
+               public uint WaveHeaderLength
+               {
+                       get { return (WAVE_HEADER_LEN); }
+               }
+
+               public uint WaveFormatPcm
+               {
+                       get { return (WAVE_FORMAT_PCM); }
+               }
+
+               public uint WaveByteRate
+               {
+                       get
+                       {
+                               return (SamplesRate * BlockSizePcm /
+                                       BLOCK_SAMPLES);
+                       }
+               }
+
+               public uint WaveBlockAlign
+               {
+                       get { return (Channels * SampleBits / 8); }
+               }
+
+               internal Format() { }
+
+               public byte[] WritePcm(short[] pcm, long len)
+               {
+                       if (pcm == null)
+                               throw new ArgumentNullException(
+                                       "bjxa.Format.WritePcm: pcm");
+                       if (len % sizeof(short) != 0)
+                               throw new ArgumentException(
+                                       "Invalid length: {len}");
+                       int pcmLen = (int)len / sizeof(short);
+                       if (pcmLen < 0 || pcmLen > pcm.Length)
+                               throw new ArgumentException(
+                                       "Invalid length: {len}");
+
+                       byte[] dst = new byte[pcmLen * sizeof(short)];
+
+                       int dstOff = 0, pcmOff = 0;
+                       while (pcmOff < pcmLen)
+                       {
+                               ushort sample = (ushort)pcm[pcmOff];
+                               pcmOff++;
+
+                               dst[dstOff] = (byte)(sample & 0xff);
+                               dstOff++;
+                               dst[dstOff] = (byte)(sample >> 8);
+                               dstOff++;
+                       }
+
+                       return (dst);
+               }
+
+               public int WritePcm(Stream wav, short[] pcm, long len)
+               {
+                       if (wav == null)
+                               throw new ArgumentNullException(
+                                       "bjxa.Format.WritePcm: wav");
+                       if (pcm == null)
+                               throw new ArgumentNullException(
+                                       "bjxa.Format.WritePcm: pcm");
+
+                       byte[] buf = WritePcm(pcm, len);
+                       wav.Write(buf, 0, buf.Length);
+                       return (buf.Length);
+               }
+       }
+
+       public sealed class FormatError : Exception
+       {
+               internal FormatError(String message) : base(message) { }
+       }
+
+       internal delegate byte Inflate(DecoderState dec, short[] dst, int off,
+               byte[] src);
+
+       internal class ChannelState
+       {
+               internal short Prev0;
+               internal short Prev1;
+       }
+
+       internal class DecoderState
+       {
+               internal uint DataLength;
+               internal uint Samples;
+               internal ushort SamplesRate;
+               internal uint BlockSize;
+               internal uint Channels;
+               internal ChannelState[] LR;
+               internal Inflate InflateFunc;
+
+               internal DecoderState()
+               {
+                       LR = new ChannelState[2] {
+                               new ChannelState(),
+                               new ChannelState(),
+                       };
+               }
+
+               internal bool IsValid()
+               {
+                       long blocks, maxSamples;
+
+                       if (DataLength == 0 || Samples == 0 ||
+                               SamplesRate == 0 || BlockSize == 0)
+                               return (false);
+
+                       if (Channels != 1 && Channels != 2)
+                               return (false);
+
+                       blocks = DataLength / BlockSize;
+                       maxSamples = (Format.BLOCK_SAMPLES * DataLength) /
+                               (BlockSize * Channels);
+
+                       if (blocks * BlockSize != DataLength)
+                               return (false);
+
+                       if (Samples > maxSamples)
+                               return (false);
+
+                       if (maxSamples - Samples >= Format.BLOCK_SAMPLES)
+                               return (false);
+
+                       if (InflateFunc == null)
+                               return (false);
+
+                       return (true);
+               }
+
+               internal Format ToFormat()
+               {
+                       Assert(IsValid());
+
+                       Format fmt = new Format();
+                       fmt.DataLengthPcm = Samples * Channels *
+                               sizeof(short);
+                       fmt.SamplesRate = SamplesRate;
+                       fmt.SampleBits = 16;
+                       fmt.Channels = Channels;
+                       fmt.BlockSizeXa = BlockSize * Channels;
+                       fmt.BlockSizePcm = Format.BLOCK_SAMPLES * Channels *
+                               sizeof(short);
+                       fmt.Blocks = DataLength / fmt.BlockSizeXa;
+
+                       Assert(fmt.Blocks * fmt.BlockSizeXa == DataLength);
+
+                       return (fmt);
+               }
+
+               internal byte Inflate(short[] dst, int off, byte[] src)
+               {
+                       return (InflateFunc(this, dst, off, src));
+               }
+       }
+
+       public class Decoder
+       {
+               DecoderState state;
+               Format fmt;
+
+               static Inflate BlockInflater(uint bits)
+               {
+                       if (bits == 4)
+                               return ((dec, dst, off, src) => {
+                                       Assert(off == 0 || off == 1);
+                                       Assert(Format.BLOCK_SAMPLES *
+                                               dec.Channels == dst.Length);
+
+                                       byte profile = src[0];
+                                       int srcOff = 1;
+
+                                       for (uint n = Format.BLOCK_SAMPLES;
+                                               n > 0; n -= 2)
+                                       {
+                                               ushort s = src[srcOff];
+                                               srcOff++;
+
+                                               dst[off] =
+                                                       (short)((s & 0xf0) << 8);
+                                               off += (int)dec.Channels;
+                                               dst[off] =
+                                                       (short)((s & 0x0f) << 12);
+                                               off += (int)dec.Channels;
+                                       }
+
+                                       return (profile);
+                               });
+
+                       if (bits == 6)
+                               return ((dec, dst, off, src) => {
+                                       Assert(off == 0 || off == 1);
+                                       Assert(Format.BLOCK_SAMPLES *
+                                               dec.Channels == dst.Length);
+
+                                       byte profile = src[0];
+                                       int srcOff = 1;
+
+                                       for (uint n = Format.BLOCK_SAMPLES;
+                                               n > 0; n -= 4)
+                                       {
+                                               int s = (src[srcOff] << 16) |
+                                                       (src[srcOff + 1] << 8) |
+                                                       src[srcOff + 2];
+                                               srcOff += 3;
+
+                                               dst[off] = (short)
+                                                       ((s & 0x00fc0000) >> 8);
+                                               off += (int)dec.Channels;
+                                               dst[off] = (short)
+                                                       ((s & 0x0003f000) >> 2);
+                                               off += (int)dec.Channels;
+                                               dst[off] = (short)
+                                                       ((s & 0x00000fc0) << 4);
+                                               off += (int)dec.Channels;
+                                               dst[off] = (short)
+                                                       ((s & 0x0000003f) << 10);
+                                               off += (int)dec.Channels;
+                                       }
+
+                                       return (profile);
+                               });
+
+                       if (bits == 8)
+                               return ((dec, dst, off, src) => {
+                                       Assert(off == 0 || off == 1);
+                                       Assert(Format.BLOCK_SAMPLES *
+                                               dec.Channels == dst.Length);
+
+                                       byte profile = src[0];
+                                       int srcOff = 1;
+
+                                       for (uint n = Format.BLOCK_SAMPLES;
+                                               n > 0; n--)
+                                       {
+                                               dst[off] =
+                                                       (short)(src[srcOff] << 8);
+                                               off += (int)dec.Channels;
+                                               srcOff++;
+                                       }
+
+                                       return (profile);
+                               });
+
+                       return (null);
+               }
+
+               public Format ReadHeader(byte[] xa)
+               {
+                       if (xa == null)
+                               throw new ArgumentNullException(
+                                       "bjxa.Decoder.ReadHeader: xa");
+                       if (xa.Length < Format.HEADER_SIZE_XA)
+                               throw new ArgumentException(
+                                       "buffer too small");
+
+                       DecoderState tmp = new DecoderState();
+                       uint magic = LittleEndian.ReadUInt(xa, 0);
+                       tmp.DataLength = LittleEndian.ReadUInt(xa, 4);
+                       tmp.Samples = LittleEndian.ReadUInt(xa, 8);
+                       tmp.SamplesRate = LittleEndian.ReadUShort(xa, 12);
+                       uint bits = xa[14];
+                       tmp.Channels = xa[15];
+                       /* XXX: skipping loop ptr field for now */
+                       tmp.LR[0].Prev0 = LittleEndian.ReadShort(xa, 20);
+                       tmp.LR[0].Prev1 = LittleEndian.ReadShort(xa, 22);
+                       tmp.LR[1].Prev0 = LittleEndian.ReadShort(xa, 24);
+                       tmp.LR[1].Prev1 = LittleEndian.ReadShort(xa, 26);
+                       /* XXX: ignoring padding for now */
+
+                       tmp.InflateFunc = BlockInflater(bits);
+                       tmp.BlockSize = bits * 4 + 1;
+
+                       if (magic != Format.HEADER_MAGIC || !tmp.IsValid())
+                               throw new FormatError("Invalid XA header");
+
+                       state = tmp;
+                       fmt = state.ToFormat();
+
+                       return (state.ToFormat());
+               }
+
+               public Format ReadHeader(Stream xa)
+               {
+                       if (xa == null)
+                               throw new ArgumentNullException(
+                                       "bjxa.Decoder.ReadHeader: xa");
+
+                       byte[] hdr = new byte[Format.HEADER_SIZE_XA];
+                       if (xa.Read(hdr, 0, hdr.Length) != hdr.Length)
+                               throw new EndOfStreamException("XA header");
+
+                       return ReadHeader(hdr);
+               }
+
+               public byte[] WriteRiffHeader()
+               {
+                       if (state == null)
+                               throw new InvalidOperationException(
+                                       "Decoder not ready");
+                       Format fmt = state.ToFormat();
+                       byte[] hdr = new byte[Format.HEADER_SIZE_RIFF];
+                       LittleEndian.Write(hdr, 0, 0x46464952, 32); /* RIFF */
+                       LittleEndian.Write(hdr, 4, fmt.RiffHeaderLength, 32);
+                       LittleEndian.Write(hdr, 8, 0x45564157, 32); /* WAVE */
+                       LittleEndian.Write(hdr, 12, 0x20746d66, 32); /* fmt  */
+                       LittleEndian.Write(hdr, 16, fmt.WaveHeaderLength, 32);
+                       LittleEndian.Write(hdr, 20, fmt.WaveFormatPcm, 16);
+                       LittleEndian.Write(hdr, 22, fmt.Channels, 16);
+                       LittleEndian.Write(hdr, 24, fmt.SamplesRate, 32);
+                       LittleEndian.Write(hdr, 28, fmt.WaveByteRate, 32);
+                       LittleEndian.Write(hdr, 32, fmt.WaveBlockAlign, 16);
+                       LittleEndian.Write(hdr, 34, fmt.SampleBits, 16);
+                       LittleEndian.Write(hdr, 36, 0x61746164, 32); /* data */
+                       LittleEndian.Write(hdr, 40, fmt.DataLengthPcm, 32);
+                       return (hdr);
+               }
+
+               public int WriteRiffHeader(Stream wav)
+               {
+                       if (state == null)
+                               throw new InvalidOperationException(
+                                       "Decoder not ready");
+                       if (wav == null)
+                               throw new ArgumentNullException(
+                                       "bjxa.Decoder.WriteRiffHeader: wav");
+
+                       byte[] hdr = WriteRiffHeader();
+                       wav.Write(hdr, 0, hdr.Length);
+                       return (hdr.Length);
+               }
+
+               private readonly short[,] GainFactor = {
+                       {  0,    0},
+                       {240,    0},
+                       {460, -208},
+                       {392, -220},
+                       {488, -240},
+               };
+
+               private void DecodeInflated(short[] pcm, int off, byte prof)
+               {
+                       Assert(off == 0 || off == 1);
+                       Assert(Format.BLOCK_SAMPLES * state.Channels ==
+                               pcm.Length);
+
+                       int factor = prof >> 4;
+                       int range = prof & 0x0f;
+
+                       if (factor >= GainFactor.Length)
+                               throw new FormatError(
+                                       $"Invalid factor: {factor}");
+
+                       ChannelState chan = state.LR[off];
+                       short k0 = GainFactor[factor, 0];
+                       short k1 = GainFactor[factor, 1];
+
+                       for (uint i = Format.BLOCK_SAMPLES; i > 0; i--)
+                       {
+                               int ranged = pcm[off] >> range;
+                               int gain = (chan.Prev0 * k0) +
+                                       (chan.Prev1 * k1);
+                               int sample = ranged + gain / 256;
+
+                               sample = Math.Max(sample, Int16.MinValue);
+                               sample = Math.Min(sample, Int16.MaxValue);
+
+                               pcm[off] = (short)sample;
+                               chan.Prev1 = chan.Prev0;
+                               chan.Prev0 = (short)sample;
+
+                               off += (int)state.Channels;
+                       }
+               }
+
+               public int Decode(byte[] xa, short[] pcm, out long pcm_data)
+               {
+                       if (state == null)
+                               throw new InvalidOperationException(
+                                       "Decoder not ready");
+                       if (xa == null)
+                               throw new ArgumentNullException(
+                                       "bjxa.Decoder.Decode: xa");
+                       if (pcm == null)
+                               throw new ArgumentNullException(
+                                       "bjxa.Decoder.Decode: pcm");
+                       Assert(fmt != null);
+                       if (fmt.Blocks == 0)
+                               throw new InvalidOperationException(
+                                       "XA stream fully decoded");
+
+                       int xaLen = xa.Length * sizeof(byte);
+                       int xaOff = 0;
+                       int pcmLen = pcm.Length * sizeof(short);
+                       int pcmOff = 0;
+                       byte[] xaBuf = new byte[state.BlockSize];
+                       short[] pcmBuf = new short[fmt.BlockSamples];
+                       int blocks = 0;
+                       long pcm_block = Math.Min(fmt.BlockSizePcm,
+                               fmt.DataLengthPcm);
+                       pcm_data = 0;
+
+                       while (fmt.Blocks > 0 && xaLen >= fmt.BlockSizeXa &&
+                               pcmLen >= pcm_block)
+                       {
+
+                               Array.Copy(xa, xaOff, xaBuf, 0, xaBuf.Length);
+                               byte prof = state.Inflate(pcmBuf, 0, xaBuf);
+                               DecodeInflated(pcmBuf, 0, prof);
+
+                               xaOff += xaBuf.Length;
+                               xaLen -= xaBuf.Length;
+
+                               if (state.Channels == 2)
+                               {
+                                       Array.Copy(xa, xaOff, xaBuf, 0,
+                                               xaBuf.Length);
+                                       prof = state.Inflate(pcmBuf, 1, xaBuf);
+                                       DecodeInflated(pcmBuf, 1, prof);
+
+                                       xaOff += xaBuf.Length;
+                                       xaLen -= xaBuf.Length;
+                               }
+
+                               Array.Copy(pcmBuf, 0, pcm, pcmOff,
+                                       pcm_block / sizeof(short));
+                               pcmOff += pcmBuf.Length;
+                               pcmLen -= (int)pcm_block;
+                               pcm_data += pcm_block;
+                               fmt.DataLengthPcm -= pcm_block;
+
+                               pcm_block = Math.Min(fmt.BlockSizePcm,
+                                       fmt.DataLengthPcm);
+
+                               blocks++;
+                               fmt.Blocks--;
+                       }
+
+                       return (blocks);
+               }
+       }
+}
\ No newline at end of file
diff --git a/libbjxa/libbjxa.csproj b/libbjxa/libbjxa.csproj
new file mode 100644 (file)
index 0000000..9f73229
--- /dev/null
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{41E67409-F5EC-4216-A790-2519A7B22E51}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>libbjxa</RootNamespace>
+    <AssemblyName>libbjxa</AssemblyName>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="libbjxa.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>echo.
+echo ビルド後イベントを開始します。
+
+set RUNTIMEDIR="$(SolutionDir)RuntimeResources"
+
+echo.
+echo (1) 出力フォルダ から ソリューション出力フォルダ へコピーします。(日付の新しいファイルのみ)
+set DESTDIR="$(SolutionDir)$(OutDir)dll"
+if not exist %25DESTDIR%25 mkdir %25DESTDIR%25
+xcopy "$(TargetDir)*.dll" %25DESTDIR%25 /Y /D /EXCLUDE:$(TargetFileName)
+
+echo.
+echo (2) 出力フォルダ から 実行時リソースフォルダ にコピーします。(日付の新しいファイルのみ)
+set DESTDIR=%25RUNTIMEDIR%25\dll
+if not exist %25DESTDIR%25 mkdir %25DESTDIR%25
+xcopy "$(TargetDir)*.dll"  %25DESTDIR%25 /Y /D
+
+echo.
+echo (3) 実行時リソースフォルダ から ソリューション出力フォルダ にコピーします。(日付の新しいファイルのみ)
+set DESTDIR="$(SolutionDir)$(OutDir)dll"
+if not exist %25DESTDIR%25 mkdir %25DESTDIR%25
+xcopy %25RUNTIMEDIR%25\dll %25DESTDIR%25 /Y /D
+
+echo.
+echo ビルド後イベントを終了しました。
+</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file