mirror of
https://github.com/Outer-Wilds-New-Horizons/new-horizons.git
synced 2025-12-11 20:15:44 +01:00
Support MP3
This commit is contained in:
parent
c2f2ddde7b
commit
756a602d7e
@ -49,25 +49,54 @@ namespace NewHorizons.Utility
|
||||
case ("ogg"):
|
||||
audioType = UnityEngine.AudioType.OGGVORBIS;
|
||||
break;
|
||||
case ("mp3"):
|
||||
Logger.LogWarning($".mp3 files take up a lot of memory! Please use .wav or .ogg instead.");
|
||||
audioType = UnityEngine.AudioType.MPEG;
|
||||
break;
|
||||
default:
|
||||
Logger.LogError($"Invalid audio file extension ({extension}) must be .wav or .ogg");
|
||||
return null;
|
||||
}
|
||||
|
||||
using (UnityWebRequest www = UnityWebRequestMultimedia.GetAudioClip(filePath, audioType))
|
||||
if (audioType == UnityEngine.AudioType.MPEG)
|
||||
{
|
||||
var result = www.SendWebRequest();
|
||||
|
||||
while (!result.isDone) { await Task.Delay(100); }
|
||||
|
||||
if (www.isNetworkError)
|
||||
string fileProtocolPath = $"file://{filePath}";
|
||||
DownloadHandlerAudioClip dh = new DownloadHandlerAudioClip(fileProtocolPath, UnityEngine.AudioType.MPEG);
|
||||
dh.compressed = true;
|
||||
using (UnityWebRequest www = new UnityWebRequest(fileProtocolPath, "GET", dh, null))
|
||||
{
|
||||
Debug.Log(www.error);
|
||||
return null;
|
||||
var result = www.SendWebRequest();
|
||||
|
||||
while (!result.isDone) { await Task.Delay(100); }
|
||||
|
||||
if (www.isNetworkError)
|
||||
{
|
||||
Debug.Log(www.error);
|
||||
return null;
|
||||
}
|
||||
else
|
||||
{
|
||||
return dh.audioClip;
|
||||
}
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
{
|
||||
using (UnityWebRequest www = UnityWebRequestMultimedia.GetAudioClip(filePath, audioType))
|
||||
{
|
||||
return DownloadHandlerAudioClip.GetContent(www);
|
||||
var result = www.SendWebRequest();
|
||||
|
||||
while (!result.isDone) { await Task.Delay(100); }
|
||||
|
||||
if (www.isNetworkError)
|
||||
{
|
||||
Debug.Log(www.error);
|
||||
return null;
|
||||
}
|
||||
else
|
||||
{
|
||||
return DownloadHandlerAudioClip.GetContent(www);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user