DirectShowLib を最新バージョン(1.0.0)に置き換え。

ついでに、ローカルで持つのをやめて、NuGet パッケージから取得するよう修正。

diff --git a/DTXManiaプロジェクト/コード/全体/Program.cs b/DTXManiaプロジェクト/コード/全体/Program.cs
index 948f5c2..256b505 100644 (file)
--- a/DTXManiaプロジェクト/コード/全体/Program.cs
+++ b/DTXManiaプロジェクト/コード/全体/Program.cs
@@ -129,9 +129,9 @@ namespace DTXMania
                                        "bass_fx.dll is not loaded. bass_fx.dll or bass.dll must not exist." + newLine + "Please download DTXMania again."\r
                                        ))\r
                                        bDLLnotfound = true;\r
-                               if (!tDLLの存在チェック("dll\\DirectShowLib-2005.dll",\r
-                                       "DirectShowLib-2005.dll が存在しません。" + newLine + "DTXManiaをダウンロードしなおしてください。",\r
-                                       "DirectShowLib-2005.dll is not found." + newLine + "Please download DTXMania again."\r
+                               if (!tDLLの存在チェック("dll\\DirectShowLib.dll",\r
+                                       "DirectShowLib.dll が存在しません。" + newLine + "DTXManiaをダウンロードしなおしてください。",\r
+                                       "DirectShowLib.dll is not found." + newLine + "Please download DTXMania again."\r
                                        ))\r
                                        bDLLnotfound = true;\r
                                #endregion\r

diff --git a/FDK17プロジェクト/FDK19.csproj b/FDK17プロジェクト/FDK19.csproj
index 88c1e67..24c309c 100644 (file)
--- a/FDK17プロジェクト/FDK19.csproj
+++ b/FDK17プロジェクト/FDK19.csproj
@@ -68,8 +68,8 @@
       <SpecificVersion>False</SpecificVersion>\r
       <HintPath>..\実行時フォルダ\dll\Bass.Net.dll</HintPath>\r
     </Reference>\r
-    <Reference Include="DirectShowLib-2005">\r
-      <HintPath>..\実行時フォルダ\dll\DirectShowLib-2005.dll</HintPath>\r
+    <Reference Include="DirectShowLib, Version=2.1.0.1599, Culture=neutral, processorArchitecture=MSIL">\r
+      <HintPath>..\packages\DirectShowLib.1.0.0\lib\DirectShowLib.dll</HintPath>\r
     </Reference>\r
     <Reference Include="SharpDX, Version=3.1.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">\r
       <HintPath>..\packages\SharpDX.3.1.1\lib\net45\SharpDX.dll</HintPath>\r

diff --git a/FDK17プロジェクト/packages.config b/FDK17プロジェクト/packages.config
index c42023c..f53fecb 100644 (file)
--- a/FDK17プロジェクト/packages.config
+++ b/FDK17プロジェクト/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="DirectShowLib" version="1.0.0" targetFramework="net451" />
   <package id="SharpDX" version="3.1.1" targetFramework="net451" />
   <package id="SharpDX.Direct3D9" version="3.1.1" targetFramework="net451" />
   <package id="SharpDX.DirectInput" version="3.1.1" targetFramework="net451" />

diff --git a/実行時フォルダ/DTXCreator.exe b/実行時フォルダ/DTXCreator.exe
index 507c71b..af62cc7 100644 (file)
Binary files a/実行時フォルダ/DTXCreator.exe and b/実行時フォルダ/DTXCreator.exe differ

diff --git a/実行時フォルダ/DTXManiaGR.exe b/実行時フォルダ/DTXManiaGR.exe
index 2dabaa9..fbbe6f7 100644 (file)
Binary files a/実行時フォルダ/DTXManiaGR.exe and b/実行時フォルダ/DTXManiaGR.exe differ

diff --git a/実行時フォルダ/dll/DirectShowLib-2005.dll b/実行時フォルダ/dll/DirectShowLib-2005.dll
deleted file mode 100644 (file)
index ba11a16..0000000
Binary files a/実行時フォルダ/dll/DirectShowLib-2005.dll and /dev/null differ

diff --git a/実行時フォルダ/dll/DirectShowLib.dll b/実行時フォルダ/dll/DirectShowLib.dll
new file mode 100644 (file)
index 0000000..7ac3f83
Binary files /dev/null and b/実行時フォルダ/dll/DirectShowLib.dll differ

diff --git a/実行時フォルダ/dll/FDK.dll b/実行時フォルダ/dll/FDK.dll
index 0ea9b08..3a82bb8 100644 (file)
Binary files a/実行時フォルダ/dll/FDK.dll and b/実行時フォルダ/dll/FDK.dll differ

diff --git a/実行時フォルダ/ja-JP/DTXCreator.resources.dll b/実行時フォルダ/ja-JP/DTXCreator.resources.dll
index dc504b9..1c130eb 100644 (file)
Binary files a/実行時フォルダ/ja-JP/DTXCreator.resources.dll and b/実行時フォルダ/ja-JP/DTXCreator.resources.dll differ

diff --git a/実行時フォルダ/ja-JP/DTXManiaGR.resources.dll b/実行時フォルダ/ja-JP/DTXManiaGR.resources.dll
index 254214e..fdb0dd6 100644 (file)
Binary files a/実行時フォルダ/ja-JP/DTXManiaGR.resources.dll and b/実行時フォルダ/ja-JP/DTXManiaGR.resources.dll differ