RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify path construction

This commit is contained in:
Dean Herbert 2017-12-27 21:05:16 +09:00
parent 496b0fef01
commit 46ef17354e
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Audio/SampleInfo.cs
View File

@ -2,6 +2,7 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.IO;
using osu.Framework.Audio.Sample;
namespace osu.Game.Audio
@ -16,14 +17,7 @@ public class SampleInfo
public SampleChannel GetChannel(SampleManager manager, string resourceNamespace = null)
{
SampleChannel channel = null;
if (!string.IsNullOrEmpty(resourceNamespace))
channel = manager.Get($"Gameplay/{resourceNamespace}/{Bank}-{Name}");
if (channel == null)
channel = manager.Get($"Gameplay/{Bank}-{Name}");
SampleChannel channel = manager.Get(Path.Combine("Gameplay", resourceNamespace ?? string.Empty, $"{Bank}-{Name}"));
channel.Volume.Value = Volume / 100.0;
return channel;
}