sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-06 16:13:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ppy/osu into general-improvements

Browse Source
This commit is contained in:
Thomas Müller
2016-10-09 16:02:35 +02:00
parent 5861e782e5 de24c86c81
commit c62f29dcae
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/GameModes/Play/PlaySongSelect.cs
View File

@ -3,12 +3,15 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using osu.Framework.Configuration;
using osu.Game.GameModes.Backgrounds; using osu.Game.GameModes.Backgrounds;
namespace osu.Game.GameModes.Play namespace osu.Game.GameModes.Play
{ {
class PlaySongSelect : GameModeWhiteBox class PlaySongSelect : GameModeWhiteBox
{ {
private Bindable<PlayMode> playMode;
protected override BackgroundMode CreateBackground() => new BackgroundModeCustom(@"Backgrounds/bg4"); protected override BackgroundMode CreateBackground() => new BackgroundModeCustom(@"Backgrounds/bg4");
protected override IEnumerable<Type> PossibleChildren => new[] { protected override IEnumerable<Type> PossibleChildren => new[] {
@ -22,7 +25,15 @@ namespace osu.Game.GameModes.Play
OsuGame osu = Game as OsuGame; OsuGame osu = Game as OsuGame;
osu.PlayMode.ValueChanged += PlayMode_ValueChanged; playMode = osu.PlayMode;
playMode.ValueChanged += PlayMode_ValueChanged;
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
playMode.ValueChanged -= PlayMode_ValueChanged;
} }
private void PlayMode_ValueChanged(object sender, EventArgs e) private void PlayMode_ValueChanged(object sender, EventArgs e)

2
osu.Game/OsuGame.cs
View File

@ -37,7 +37,7 @@ namespace osu.Game
{ {
base.Load(); base.Load();
//attach out bindables to the audio subsystem. //attach our bindables to the audio subsystem.
Audio.Volume.Weld(Config.GetBindable<double>(OsuConfig.VolumeGlobal)); Audio.Volume.Weld(Config.GetBindable<double>(OsuConfig.VolumeGlobal));
Audio.VolumeSample.Weld(Config.GetBindable<double>(OsuConfig.VolumeEffect)); Audio.VolumeSample.Weld(Config.GetBindable<double>(OsuConfig.VolumeEffect));
Audio.VolumeTrack.Weld(Config.GetBindable<double>(OsuConfig.VolumeMusic)); Audio.VolumeTrack.Weld(Config.GetBindable<double>(OsuConfig.VolumeMusic));