h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-06 21:02:59 +08:00
Code Issues Releases Wiki Activity

Use new bind method

Browse Source
This commit is contained in:
Dean Herbert 2018-06-07 16:46:54 +09:00
parent e6158bc348
commit 475fb06559
5 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Overlays/MusicController.cs
View File

@ -237,11 +237,8 @@ namespace osu.Game.Overlays
protected override void LoadComplete() protected override void LoadComplete()
{ {
beatmap.ValueChanged += beatmapChanged; beatmap.BindValueChanged(beatmapChanged, true);
beatmap.DisabledChanged += beatmapDisabledChanged; beatmap.BindDisabledChanged(beatmapDisabledChanged, true);
beatmapChanged(beatmap.Value);
base.LoadComplete(); base.LoadComplete();
} }

4
osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs
View File

@ -47,9 +47,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
private void load(IBindableBeatmap beatmap) private void load(IBindableBeatmap beatmap)
{ {
this.beatmap.BindTo(beatmap); this.beatmap.BindTo(beatmap);
this.beatmap.BindValueChanged(beatmapChanged, true);
beatmap.ValueChanged += beatmapChanged;
beatmapChanged(beatmap.Value);
} }
private void beatmapChanged(WorkingBeatmap beatmap) => waveform.Beatmap = beatmap; private void beatmapChanged(WorkingBeatmap beatmap) => waveform.Beatmap = beatmap;

6
osu.Game/Screens/Select/SongSelect.cs
View File

@ -207,10 +207,8 @@ namespace osu.Game.Screens.Select
Carousel.BeatmapSets = this.beatmaps.GetAllUsableBeatmapSetsEnumerable(); Carousel.BeatmapSets = this.beatmaps.GetAllUsableBeatmapSetsEnumerable();
Beatmap.DisabledChanged += disabled => Carousel.AllowSelection = !disabled; Beatmap.BindDisabledChanged(disabled => Carousel.AllowSelection = !disabled, true);
Beatmap.ValueChanged += workingBeatmapChanged; Beatmap.BindValueChanged(workingBeatmapChanged);
workingBeatmapChanged(Beatmap.Value);
} }
public void Edit(BeatmapInfo beatmap) public void Edit(BeatmapInfo beatmap)

3
osu.Game/Tests/Visual/EditorClockTestCase.cs
View File

@ -32,8 +32,7 @@ namespace osu.Game.Tests.Visual
Dependencies.CacheAs<IFrameBasedClock>(Clock); Dependencies.CacheAs<IFrameBasedClock>(Clock);
Dependencies.CacheAs<IAdjustableClock>(Clock); Dependencies.CacheAs<IAdjustableClock>(Clock);
Beatmap.ValueChanged += beatmapChanged; Beatmap.BindValueChanged(beatmapChanged, true);
beatmapChanged(Beatmap.Value);
} }
private void beatmapChanged(WorkingBeatmap working) private void beatmapChanged(WorkingBeatmap working)

2
osu.Game/osu.Game.csproj
View File

@ -18,7 +18,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.0.3" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="ppy.osu.Framework" Version="2018.606.0" /> <PackageReference Include="ppy.osu.Framework" Version="2018.607.0" />
<PackageReference Include="SharpCompress" Version="0.18.1" /> <PackageReference Include="SharpCompress" Version="0.18.1" />
<PackageReference Include="NUnit" Version="3.10.1" /> <PackageReference Include="NUnit" Version="3.10.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />