Skip to content

Commit aae182d

Browse files
committed
wwise fix
1 parent 3eb4c0d commit aae182d

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

FModel/ViewModels/CUE4ParseViewModel.cs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
using System.Threading;
1111
using System.Threading.Tasks;
1212
using System.Windows;
13+
1314
using AdonisUI.Controls;
15+
1416
using CUE4Parse;
1517
using CUE4Parse.Compression;
1618
using CUE4Parse.Encryption.Aes;
@@ -19,8 +21,8 @@
1921
using CUE4Parse.FileProvider.Vfs;
2022
using CUE4Parse.GameTypes.Aion2.Objects;
2123
using CUE4Parse.GameTypes.AshEchoes.FileProvider;
22-
using CUE4Parse.GameTypes.DPA.UE4.Assets.Exports.Wwise;
2324
using CUE4Parse.GameTypes.KRD.Assets.Exports;
25+
using CUE4Parse.GameTypes.SMG.UE4.Assets.Exports.Wwise;
2426
using CUE4Parse.MappingsProvider;
2527
using CUE4Parse.UE4.AssetRegistry;
2628
using CUE4Parse.UE4.Assets;
@@ -51,11 +53,14 @@
5153
using CUE4Parse.UE4.Versions;
5254
using CUE4Parse.UE4.Wwise;
5355
using CUE4Parse.Utils;
56+
5457
using CUE4Parse_Conversion;
5558
using CUE4Parse_Conversion.Sounds;
59+
5660
using EpicManifestParser;
5761
using EpicManifestParser.UE;
5862
using EpicManifestParser.ZlibngDotNetDecompressor;
63+
5964
using FModel.Creator;
6065
using FModel.Extensions;
6166
using FModel.Framework;
@@ -64,14 +69,21 @@
6469
using FModel.Views;
6570
using FModel.Views.Resources.Controls;
6671
using FModel.Views.Snooper;
72+
6773
using Newtonsoft.Json;
6874
using Newtonsoft.Json.Converters;
75+
6976
using OpenTK.Windowing.Common;
7077
using OpenTK.Windowing.Desktop;
78+
7179
using Serilog;
80+
7281
using SkiaSharp;
82+
7383
using Svg.Skia;
84+
7485
using UE4Config.Parsing;
86+
7587
using Application = System.Windows.Application;
7688
using FGuid = CUE4Parse.UE4.Objects.Core.Misc.FGuid;
7789

@@ -297,7 +309,7 @@ await _threadWorkerView.Begin(cancellationToken =>
297309
}
298310

299311
Provider.Initialize();
300-
_wwiseProviderLazy = new Lazy<WwiseProvider>(() => new WwiseProvider(Provider, UserSettings.Default.WwiseMaxBnkPrefetch));
312+
_wwiseProviderLazy = new Lazy<WwiseProvider>(() => new WwiseProvider(Provider, UserSettings.Default.GameDirectory, UserSettings.Default.WwiseMaxBnkPrefetch));
301313
_fmodProviderLazy = new Lazy<FModProvider>(() => new FModProvider(Provider, UserSettings.Default.GameDirectory));
302314
_criWareProviderLazy = new Lazy<CriWareProvider>(() => new CriWareProvider(Provider, UserSettings.Default.GameDirectory));
303315
Log.Information($"{Provider.Versions.Game} ({Provider.Versions.Platform}) | Archives: x{Provider.UnloadedVfs.Count} | AES: x{Provider.RequiredKeys.Count} | Loose Files: x{Provider.Files.Count}");

FModel/ViewModels/GameFileViewModel.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
using System.Windows;
66
using System.Windows.Media;
77
using System.Windows.Media.Imaging;
8+
89
using CUE4Parse.FileProvider.Objects;
9-
using CUE4Parse.GameTypes.DPA.UE4.Assets.Exports.Wwise;
1010
using CUE4Parse.GameTypes.FN.Assets.Exports.DataAssets;
11+
using CUE4Parse.GameTypes.SMG.UE4.Assets.Exports.Wwise;
1112
using CUE4Parse.UE4.Assets;
1213
using CUE4Parse.UE4.Assets.Exports.Animation;
1314
using CUE4Parse.UE4.Assets.Exports.BuildData;
@@ -38,12 +39,17 @@
3839
using CUE4Parse.UE4.Objects.UObject;
3940
using CUE4Parse.UE4.Objects.UObject.Editor;
4041
using CUE4Parse.Utils;
42+
4143
using CUE4Parse_Conversion.Textures;
44+
4245
using FModel.Framework;
4346
using FModel.Services;
4447
using FModel.Settings;
48+
4549
using Serilog;
50+
4651
using SkiaSharp;
52+
4753
using Svg.Skia;
4854

4955
namespace FModel.ViewModels;

0 commit comments

Comments
 (0)