diff --git a/ArcFormats/ArcFormats.csproj b/ArcFormats/ArcFormats.csproj
index d4c9f0e0..aad1db4d 100644
--- a/ArcFormats/ArcFormats.csproj
+++ b/ArcFormats/ArcFormats.csproj
@@ -51,16 +51,79 @@
MinimumRecommendedRules.ruleset
+
+ ..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll
+
+
+ ..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll
+
+
+ ..\packages\Microsoft.Win32.Registry.4.7.0\lib\net461\Microsoft.Win32.Registry.dll
+
+
+ ..\packages\NAudio.2.2.1\lib\net472\NAudio.dll
+
+
+ ..\packages\NAudio.Asio.2.2.1\lib\netstandard2.0\NAudio.Asio.dll
+
+
+ ..\packages\NAudio.Core.2.2.1\lib\netstandard2.0\NAudio.Core.dll
+
+
+ ..\packages\NAudio.Midi.2.2.1\lib\netstandard2.0\NAudio.Midi.dll
+
+
+ ..\packages\NAudio.Wasapi.2.2.1\lib\netstandard2.0\NAudio.Wasapi.dll
+
+
+ ..\packages\NAudio.WinForms.2.2.1\lib\net472\NAudio.WinForms.dll
+
+
+ ..\packages\NAudio.WinMM.2.2.1\lib\netstandard2.0\NAudio.WinMM.dll
+
+
+ ..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll
+
+
+ ..\packages\NVorbis.0.10.5\lib\net45\NVorbis.dll
+
+
+ ..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll
+
+
+ ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll
+
+
+ ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll
+
+
+ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll
+
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll
+
+
+ ..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll
+
+
+ ..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll
+
+
+ ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll
+
+
+ ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll
+
@@ -68,6 +131,9 @@
+
+ ..\packages\ZstdNet.1.5.7\lib\netstandard2.0\ZstdNet.dll
+
@@ -893,6 +959,7 @@
+
Code
@@ -1329,4 +1396,11 @@ exit 0
if not exist "$(TargetDir)\GameData" mkdir "$(TargetDir)\GameData"
xcopy "$(ProjectDir)\Resources\*" "$(TargetDir)\GameData\" /D /Y >NUL
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
\ No newline at end of file
diff --git a/ArcFormats/AudioWMA.cs b/ArcFormats/AudioWMA.cs
index dca846a3..f80ffe3d 100644
--- a/ArcFormats/AudioWMA.cs
+++ b/ArcFormats/AudioWMA.cs
@@ -136,7 +136,7 @@ namespace GameRes.Formats
private static long GetDuration (IMFSourceReader reader)
{
- var variantPtr = Marshal.AllocHGlobal (MarshalHelpers.SizeOf());
+ var variantPtr = Marshal.AllocHGlobal (Marshal.SizeOf());
try
{
int hResult = reader.GetPresentationAttribute (MediaFoundationInterop.MF_SOURCE_READER_MEDIASOURCE,
@@ -146,7 +146,7 @@ namespace GameRes.Formats
if (hResult != 0)
Marshal.ThrowExceptionForHR (hResult);
- var variant = MarshalHelpers.PtrToStructure (variantPtr);
+ var variant = Marshal.PtrToStructure (variantPtr);
return (long)variant.Value;
}
finally
diff --git a/ArcFormats/Properties/Settings.Designer.cs b/ArcFormats/Properties/Settings.Designer.cs
index 092b151f..8fba100a 100644
--- a/ArcFormats/Properties/Settings.Designer.cs
+++ b/ArcFormats/Properties/Settings.Designer.cs
@@ -849,5 +849,17 @@ namespace GameRes.Formats.Properties {
this["TIM2AlphaFormat"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("")]
+ public string BELLDATATitle {
+ get {
+ return ((string)(this["BELLDATATitle"]));
+ }
+ set {
+ this["BELLDATATitle"] = value;
+ }
+ }
}
}
diff --git a/ArcFormats/Properties/Settings.settings b/ArcFormats/Properties/Settings.settings
index 50457412..35cbe992 100644
--- a/ArcFormats/Properties/Settings.settings
+++ b/ArcFormats/Properties/Settings.settings
@@ -209,5 +209,8 @@
RGBA
+
+
+
\ No newline at end of file
diff --git a/ArcFormats/app.config b/ArcFormats/app.config
index a24fb93f..b9794f44 100644
--- a/ArcFormats/app.config
+++ b/ArcFormats/app.config
@@ -1,17 +1,17 @@
-
+
-
+
-
+
-
+
4294967295
@@ -31,11 +31,8 @@
shift-jis
-
- None
-
-
+
False
@@ -62,22 +59,22 @@
8
-
+
-
+
-
+
Default
-
+
-
+
65432
@@ -86,37 +83,37 @@
1139247708
-
+
-
+
-
+
0
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Optimal
@@ -125,49 +122,49 @@
932
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
True
@@ -179,7 +176,7 @@
True
-
+
False
@@ -194,10 +191,10 @@
932
-
+
-
+
932
@@ -209,13 +206,28 @@
932
- RGBA
+ RGBA
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ArcFormats/packages.config b/ArcFormats/packages.config
new file mode 100644
index 00000000..42b37320
--- /dev/null
+++ b/ArcFormats/packages.config
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file