mirror of
https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
synced 2024-11-09 19:25:10 +00:00
Merge branch 'release_1'
This commit is contained in:
commit
99d27a4584
3 changed files with 13 additions and 10 deletions
|
@ -98,7 +98,6 @@ namespace HeavenStudio
|
|||
CustomScreenWidth = PersistentDataManager.gameSettings.resolutionWidth;
|
||||
CustomScreenHeight = PersistentDataManager.gameSettings.resolutionHeight;
|
||||
|
||||
|
||||
if (PersistentDataManager.gameSettings.dspSize == 0)
|
||||
PersistentDataManager.gameSettings.dspSize = 512;
|
||||
if (PersistentDataManager.gameSettings.sampleRate == 0)
|
||||
|
|
|
@ -151,12 +151,15 @@ namespace HeavenStudio
|
|||
|
||||
public static string JukeboxAudioConverter(string filePath, AudioType audioType, string specificType)
|
||||
{
|
||||
if (Directory.Exists(Path.Combine(Application.temporaryCachePath, "/savewav")))
|
||||
string wavCachePath = Path.Combine(Application.temporaryCachePath, "savewav");
|
||||
if (Directory.Exists(wavCachePath))
|
||||
{
|
||||
Directory.Delete(Path.Combine(Application.temporaryCachePath, "/savewav"), true);
|
||||
Directory.Delete(wavCachePath, true);
|
||||
}
|
||||
if (!Directory.Exists(wavCachePath))
|
||||
{
|
||||
Directory.CreateDirectory(wavCachePath);
|
||||
}
|
||||
if (!Directory.Exists(Application.temporaryCachePath, "/savewav"))
|
||||
Directory.CreateDirectory(Application.temporaryCachePath, "/savewav");
|
||||
if (audioType == AudioType.MPEG)
|
||||
{
|
||||
Debug.Log($"mp3 loaded, Converting {filePath} to wav...");
|
||||
|
@ -174,8 +177,8 @@ namespace HeavenStudio
|
|||
}
|
||||
AudioClip clip = DownloadHandlerAudioClip.GetContent(www);
|
||||
string fileName = Path.GetFileNameWithoutExtension(filePath);
|
||||
SavWav.Save("/savewav/" + fileName, clip, true);
|
||||
filePath = Path.Combine(Application.temporaryCachePath, "/savewav/" + fileName + ".wav");
|
||||
SavWav.Save(fileName, clip, true);
|
||||
filePath = Path.Combine(wavCachePath, $"{fileName}.wav");
|
||||
|
||||
clip = null;
|
||||
}
|
||||
|
|
|
@ -49,17 +49,18 @@ public static class SavWav
|
|||
|
||||
public static void Save(string filename, AudioClip clip, bool trim = false)
|
||||
{
|
||||
string wavCachePath = Path.Combine(Application.temporaryCachePath, "savewav");
|
||||
if (!filename.ToLower().EndsWith(".wav"))
|
||||
{
|
||||
filename += ".wav";
|
||||
}
|
||||
|
||||
var filepath = Path.Combine(Application.temporaryCachePath, filename);
|
||||
var filepath = Path.Combine(wavCachePath, filename);
|
||||
|
||||
// Make sure directory exists if user is saving to sub dir.
|
||||
if (!Directory.Exists(Path.GetDirectoryName(filepath)))
|
||||
if (!Directory.Exists(Path.GetDirectoryName(wavCachePath)))
|
||||
{
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(filepath));
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(wavCachePath));
|
||||
}
|
||||
|
||||
using (var fileStream = new FileStream(filepath, FileMode.Create))
|
||||
|
|
Loading…
Reference in a new issue