diff --git a/AssetStudioGUI/Exporter.cs b/AssetStudioGUI/Exporter.cs index 9639c97..deb2863 100644 --- a/AssetStudioGUI/Exporter.cs +++ b/AssetStudioGUI/Exporter.cs @@ -66,7 +66,7 @@ namespace AssetStudioGUI if (m_AudioData == null || m_AudioData.Length == 0) return false; var converter = new AudioClipConverter(m_AudioClip); - if (Properties.Settings.Default.convertAudio && converter.IsFMODSupport) + if (Properties.Settings.Default.convertAudio && converter.IsSupport) { var exportFullName = exportPath + item.Text + ".wav"; if (ExportFileExists(exportFullName)) diff --git a/AssetStudioUtility/AudioClipConverter.cs b/AssetStudioUtility/AudioClipConverter.cs index c6a6c70..f7c77ce 100644 --- a/AssetStudioUtility/AudioClipConverter.cs +++ b/AssetStudioUtility/AudioClipConverter.cs @@ -116,24 +116,24 @@ namespace AssetStudio case AudioCompressionFormat.MP3: return ".fsb"; case AudioCompressionFormat.VAG: - return ".vag"; + return ".fsb"; case AudioCompressionFormat.HEVAG: - return ".vag"; + return ".fsb"; case AudioCompressionFormat.XMA: - return ".wav"; + return ".fsb"; case AudioCompressionFormat.AAC: return ".m4a"; case AudioCompressionFormat.GCADPCM: return ".fsb"; case AudioCompressionFormat.ATRAC9: - return ".at9"; + return ".fsb"; } } return ".AudioClip"; } - public bool IsFMODSupport + public bool IsSupport { get { @@ -147,7 +147,6 @@ namespace AssetStudio case AudioType.S3M: case AudioType.XM: case AudioType.XMA: - case AudioType.VAG: case AudioType.AUDIOQUEUE: return true; default: @@ -162,11 +161,7 @@ namespace AssetStudio case AudioCompressionFormat.Vorbis: case AudioCompressionFormat.ADPCM: case AudioCompressionFormat.MP3: - case AudioCompressionFormat.VAG: - case AudioCompressionFormat.HEVAG: case AudioCompressionFormat.XMA: - case AudioCompressionFormat.GCADPCM: - case AudioCompressionFormat.ATRAC9: return true; default: return false;