Merge pull request #8467 from peppy/update-framework

Update framework

osu.Android.props

@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.319.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.327.0" />
   </ItemGroup>
 </Project>

osu.Game.Tests/Resources/storyboard_no_video.osu

@@ -0,0 +1,31 @@
+osu file format v14
+
+[Events]
+//Background and Video events
+0,0,"BG.jpg",0,0
+Video,0,"video.avi"
+//Break Periods
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Layer 4 (Overlay)
+//Storyboard Sound Samples
+
+[TimingPoints]
+1674,333.333333333333,4,2,1,70,1,0
+1674,-100,4,2,1,70,0,0
+3340,-100,4,2,1,70,0,0
+3507,-100,4,2,1,70,0,0
+3673,-100,4,2,1,70,0,0
+
+[Colours]
+Combo1 : 240,80,80
+Combo2 : 171,252,203
+Combo3 : 128,128,255
+Combo4 : 249,254,186
+
+[HitObjects]
+148,303,1674,5,6,3:2:0:0:
+378,252,1840,1,0,0:0:0:0:
+389,270,2340,5,2,0:1:0:0:

osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs

@@ -9,8 +9,12 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
+using osu.Game.IO;
 using osu.Game.Overlays;
+using osu.Game.Storyboards;
 using osu.Game.Storyboards.Drawables;
+using osu.Game.Tests.Resources;
 using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -54,7 +58,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                     State = { Value = Visibility.Visible },
                 }
             });
+        }
 
+        [Test]
+        public void TestStoryboard()
+        {
             AddStep("Restart", restart);
             AddToggleStep("Passing", passing =>
             {
@@ -62,6 +70,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
         }
 
+        [Test]
+        public void TestStoryboardMissingVideo()
+        {
+            AddStep("Load storyboard with missing video", loadStoryboardNoVideo);
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -94,5 +108,28 @@ namespace osu.Game.Tests.Visual.Gameplay
             storyboardContainer.Add(storyboard);
             decoupledClock.ChangeSource(working.Track);
         }
+
+        private void loadStoryboardNoVideo()
+        {
+            if (storyboard != null)
+                storyboardContainer.Remove(storyboard);
+
+            var decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = true };
+            storyboardContainer.Clock = decoupledClock;
+
+            Storyboard sb;
+
+            using (var str = TestResources.OpenResource("storyboard_no_video.osu"))
+            using (var bfr = new LineBufferedReader(str))
+            {
+                var decoder = new LegacyStoryboardDecoder();
+                sb = decoder.Decode(bfr);
+            }
+
+            storyboard = sb.CreateDrawable(Beatmap.Value);
+
+            storyboardContainer.Add(storyboard);
+            decoupledClock.ChangeSource(Beatmap.Value.Track);
+        }
     }
 }

osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Configuration;
@@ -56,24 +57,32 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 },
             };
 
-            rawInputToggle.ValueChanged += enabled =>
+            if (RuntimeInfo.OS != RuntimeInfo.Platform.Windows)
             {
-                // this is temporary until we support per-handler settings.
-                const string raw_mouse_handler = @"OsuTKRawMouseHandler";
-                const string standard_mouse_handler = @"OsuTKMouseHandler";
-
-                ignoredInputHandler.Value = enabled.NewValue ? standard_mouse_handler : raw_mouse_handler;
-            };
-
-            ignoredInputHandler = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
-            ignoredInputHandler.ValueChanged += handler =>
+                rawInputToggle.Disabled = true;
+                sensitivity.Bindable.Disabled = true;
+            }
+            else
             {
-                bool raw = !handler.NewValue.Contains("Raw");
-                rawInputToggle.Value = raw;
-                sensitivity.Bindable.Disabled = !raw;
-            };
+                rawInputToggle.ValueChanged += enabled =>
+                {
+                    // this is temporary until we support per-handler settings.
+                    const string raw_mouse_handler = @"OsuTKRawMouseHandler";
+                    const string standard_mouse_handler = @"OsuTKMouseHandler";
 
-            ignoredInputHandler.TriggerChange();
+                    ignoredInputHandler.Value = enabled.NewValue ? standard_mouse_handler : raw_mouse_handler;
+                };
+
+                ignoredInputHandler = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
+                ignoredInputHandler.ValueChanged += handler =>
+                {
+                    bool raw = !handler.NewValue.Contains("Raw");
+                    rawInputToggle.Value = raw;
+                    sensitivity.Bindable.Disabled = !raw;
+                };
+
+                ignoredInputHandler.TriggerChange();
+            }
         }
 
         private class SensitivitySetting : SettingsSlider<double, SensitivitySlider>

osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs

@@ -55,6 +55,8 @@ namespace osu.Game.Storyboards.Drawables
         {
             base.LoadComplete();
 
+            if (videoSprite == null) return;
+
             using (videoSprite.BeginAbsoluteSequence(0))
                 videoSprite.FadeIn(500);
         }

osu.Game/osu.Game.csproj

@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.319.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.327.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />

osu.iOS.props

@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.319.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.327.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -79,7 +79,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.319.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.327.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />