fix mogg panning on all platforms (YARC-Official#480)

alexdlli · Jun 20, 2023 · b78684f · b78684f
1 parent 732737c
commit b78684f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 deletions.
diff --git a/Assets/Plugins/BassNative/Linux/x86_64/libbass.so b/Assets/Plugins/BassNative/Linux/x86_64/libbass.so
diff --git a/Assets/Plugins/BassNative/Mac/libbass.dylib b/Assets/Plugins/BassNative/Mac/libbass.dylib
diff --git a/Assets/Plugins/BassNative/Windows/x86/bass.dll b/Assets/Plugins/BassNative/Windows/x86/bass.dll
diff --git a/Assets/Plugins/BassNative/Windows/x86_64/bass.dll b/Assets/Plugins/BassNative/Windows/x86_64/bass.dll
diff --git a/Assets/Script/Audio/Bass/BassAudioManager.cs b/Assets/Script/Audio/Bass/BassAudioManager.cs
@@ -274,14 +274,11 @@ public void LoadMogg(ExtractedConSongEntry exConSong, float speed, params SongSt
 
 			// Initialize stream
 
-#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN
-			// Last flag is new BASS_STREAM_NOREORDER flag, which is not in the BassFlags enum,
+			// Last flag is new BASS_SAMPLE_NOREORDER flag, which is not in the BassFlags enum,
 			// as it was made as part of an update to fix <= 8 channel oggs.
-			const BassFlags flags = BassFlags.Prescan | BassFlags.Decode | BassFlags.AsyncFile | (BassFlags)805306368;
-#else
-			// Currently don't have the new BASS update which has the mogg fix.
-			const BassFlags flags = BassFlags.Prescan | BassFlags.Decode | BassFlags.AsyncFile;
-#endif
+			// https://www.un4seen.com/forum/?topic=20148.msg140872#msg140872
+			const BassFlags flags = BassFlags.Prescan | BassFlags.Decode | BassFlags.AsyncFile | (BassFlags)64;
+
 			int moggStreamHandle = Bass.CreateStream(moggArray, 0, moggArray.Length, flags);
 			if (moggStreamHandle == 0) {
 				Debug.LogError($"Failed to load mogg file or position: {Bass.LastError}");

diff --git a/Assets/Script/Audio/Bass/BassStemChannel.cs b/Assets/Script/Audio/Bass/BassStemChannel.cs
@@ -97,12 +97,11 @@ public int Load(float speed) {
 					return -1;
 				}
 
-#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN
-				const BassFlags flags = BassFlags.Prescan | BassFlags.Decode | BassFlags.AsyncFile | (BassFlags)805306368;
-#else
-				// Currently don't have the new BASS update which has the mogg fix.
-				const BassFlags flags = BassFlags.Prescan | BassFlags.Decode | BassFlags.AsyncFile;
-#endif
+				// Last flag is new BASS_SAMPLE_NOREORDER flag, which is not in the BassFlags enum,
+				// as it was made as part of an update to fix <= 8 channel oggs.
+				// https://www.un4seen.com/forum/?topic=20148.msg140872#msg140872
+				const BassFlags flags = BassFlags.Prescan | BassFlags.Decode | BassFlags.AsyncFile | (BassFlags)64;
+
 				_sourceHandle = Bass.CreateStream(_path, 0, 0, flags);
 				if (_sourceHandle == 0) {
 					return (int) Bass.LastError;