Implement IAdjustableAudioComponent in MasterGameplayClockContainer

ppy · Sep 5, 2022 · e33486a · e33486a
1 parent 6296c97
commit e33486a
Showing 1 changed file with 28 additions and 7 deletions.
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Play
     /// <remarks>
     /// This is intended to be used as a single controller for gameplay, or as a reference source for other <see cref="GameplayClockContainer"/>s.
     /// </remarks>
-    public class MasterGameplayClockContainer : GameplayClockContainer, IBeatSyncProvider
+    public class MasterGameplayClockContainer : GameplayClockContainer, IBeatSyncProvider, IAdjustableAudioComponent
     {
         /// <summary>
         /// Duration before gameplay start time required before skip button displays.
@@ -41,6 +41,8 @@ public class MasterGameplayClockContainer : GameplayClockContainer, IBeatSyncPro
 
         private readonly WorkingBeatmap beatmap;
 
+        private readonly Track track;
+
         private readonly double skipTargetTime;
 
         private readonly List<Bindable<double>> nonGameplayAdjustments = new List<Bindable<double>>();
@@ -66,6 +68,7 @@ public class MasterGameplayClockContainer : GameplayClockContainer, IBeatSyncPro
         public MasterGameplayClockContainer(WorkingBeatmap beatmap, double skipTargetTime)
             : base(beatmap.Track, true)
         {
+            track = beatmap.Track;
             this.beatmap = beatmap;
             this.skipTargetTime = skipTargetTime;
 
@@ -195,9 +198,6 @@ private void addSourceClockAdjustments()
             if (speedAdjustmentsApplied)
                 return;
 
-            if (SourceClock is not Track track)
-                return;
-
             track.AddAdjustment(AdjustableProperty.Frequency, GameplayClock.ExternalPauseFrequencyAdjust);
             track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
@@ -212,9 +212,6 @@ private void removeSourceClockAdjustments()
             if (!speedAdjustmentsApplied)
                 return;
 
-            if (SourceClock is not Track track)
-                return;
-
             track.RemoveAdjustment(AdjustableProperty.Frequency, GameplayClock.ExternalPauseFrequencyAdjust);
             track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
@@ -234,5 +231,29 @@ protected override void Dispose(bool isDisposing)
         IClock IBeatSyncProvider.Clock => this;
 
         ChannelAmplitudes IHasAmplitudes.CurrentAmplitudes => beatmap.TrackLoaded ? beatmap.Track.CurrentAmplitudes : ChannelAmplitudes.Empty;
+
+        void IAdjustableAudioComponent.AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) =>
+            track.AddAdjustment(type, adjustBindable);
+
+        void IAdjustableAudioComponent.RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) =>
+            track.RemoveAdjustment(type, adjustBindable);
+
+        public void RemoveAllAdjustments(AdjustableProperty type)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void BindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+        public void UnbindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+
+        public BindableNumber<double> Volume => throw new NotImplementedException();
+        public BindableNumber<double> Balance => throw new NotImplementedException();
+        public BindableNumber<double> Frequency => throw new NotImplementedException();
+        public BindableNumber<double> Tempo => throw new NotImplementedException();
+
+        public IBindable<double> AggregateVolume => throw new NotImplementedException();
+        public IBindable<double> AggregateBalance => throw new NotImplementedException();
+        public IBindable<double> AggregateFrequency => throw new NotImplementedException();
+        public IBindable<double> AggregateTempo => throw new NotImplementedException();
     }
 }