mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-07-16 19:14:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update FMOD to v2.03.06

Browse Source 
- Fixed a bug that caused audioСlip preview volume to reset when selecting an asset
- Added some native libs for linux-arm64, win-arm64
This commit is contained in:
VaDiM
2025-03-21 00:40:42 +03:00
parent bc0e32efec
commit 47d67e0a49
23 changed files with 2066 additions and 1479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
AssetStudioGUI/AssetStudioGUIForm.cs
View File

@ -1133,7 +1133,7 @@ namespace AssetStudioGUI
bits;
}
var errorMsg = result == FMOD.RESULT.ERR_VERSION
? "Unsupported fmod version. Try to export raw and convert with an external tool instead."
? "Unsupported version of fmod sound. Try to export raw and convert with an external tool instead."
: $"Preview not available, try to export instead. {FMOD.Error.String(result)}";
StatusStripUpdate(errorMsg);
FMODreset();
@ -2465,12 +2465,16 @@ namespace AssetStudioGUI
{
//skip
}
#pragma warning restore WFO5001
#endif
if (isDarkMode)
{
assetListView.GridLines = false;
}
#pragma warning restore WFO5001
#endif
else
{
FMODloopButton.UseVisualStyleBackColor = true;
}
}
private void colorThemeAutoToolStripMenuItem_Click(object sender, EventArgs e)
@ -2588,10 +2592,8 @@ namespace AssetStudioGUI
result = system.init(2, FMOD.INITFLAGS.NORMAL, IntPtr.Zero);
if (ERRCHECK(result)) { return; }
result = system.getMasterSoundGroup(out masterSoundGroup);
if (ERRCHECK(result)) { return; }
result = masterSoundGroup.setVolume(FMODVolume);
_ = system.getMasterChannelGroup(out var channelGroup);
result = channelGroup.setVolume(FMODVolume);
if (ERRCHECK(result)) { return; }
}
@ -2607,9 +2609,17 @@ namespace AssetStudioGUI
if (sound.hasHandle())
{
var result = sound.release();
FMOD.RESULT result;
sound.getSubSoundParent(out var parentsound);
result = sound.release();
ERRCHECK(result);
sound.clearHandle();
if (parentsound.hasHandle())
{
result = parentsound.release();
ERRCHECK(result);
parentsound.clearHandle();
}
}
if (soundBuff != null)
{
@ -2655,7 +2665,6 @@ namespace AssetStudioGUI
{
if (ERRCHECK(result)) { return; }
}
}
}
}
@ -2748,16 +2757,20 @@ namespace AssetStudioGUI
if (playing || paused)
{
result = channel.setMode(loopMode);
if (ERRCHECK(result)) { return; }
if ((result != FMOD.RESULT.OK) && (result != FMOD.RESULT.ERR_INVALID_HANDLE))
{
if (ERRCHECK(result)) { return; }
}
}
}
}
private void FMODvolumeBar_ValueChanged(object sender, EventArgs e)
{
FMODVolume = Convert.ToSingle(FMODvolumeBar.Value) / 10;
FMODVolume = FMODvolumeBar.Value / 10f;
var result = masterSoundGroup.setVolume(FMODVolume);
_ = system.getMasterChannelGroup(out var channelGroup);
var result = channelGroup.setVolume(FMODVolume);
if (ERRCHECK(result)) { return; }
}
@ -2787,7 +2800,6 @@ namespace AssetStudioGUI
if (ERRCHECK(result)) { return; }
}
result = channel.isPlaying(out var playing);
if ((result != FMOD.RESULT.OK) && (result != FMOD.RESULT.ERR_INVALID_HANDLE))
{
@ -2823,6 +2835,12 @@ namespace AssetStudioGUI
{
ERRCHECK(result);
}
if (!playing)
{
timer.Stop();
ms = 0;
}
}
FMODtimerLabel.Text = $"{ms / 1000 / 60:00}:{ms / 1000 % 60:00}.{ms / 10 % 100:00} / {FMODlenms / 1000 / 60:00}:{FMODlenms / 1000 % 60:00}.{FMODlenms / 10 % 100:00}";

BIN
AssetStudioGUI/Libraries/x64/fmod.dll
View File

Binary file not shown.

BIN
AssetStudioGUI/Libraries/x86/fmod.dll
View File

Binary file not shown.

6
AssetStudioGUI/ParallelExport.cs
View File

@ -119,11 +119,9 @@ namespace AssetStudioGUI
debugLog += GenerateAudioClipInfo(m_AudioClip);
}
var debugLogConverter = "";
var buffer = converter.IsLegacy
? converter.RawAudioClipToWav(out debugLogConverter)
: converter.ConvertToWav(m_AudioData, out debugLogConverter);
debugLog += debugLogConverter;
? converter.RawAudioClipToWav(ref debugLog)
: converter.ConvertToWav(m_AudioData, ref debugLog);
if (buffer == null)
{
Logger.Warning($"{debugLog}Failed to export \"{item.Text}\": Failed to convert fmod audio to Wav");