[AudioGraphSettings] Move AudioSettings To Base

Raspberry-Monster · Raspberry-Monster · commit 1c9dcd7d0780 · 2024-07-13T14:26:51.000+08:00
diff --git a/HyPlayer.PlayCore.Abstraction/Models/AudioServiceSettingsBase.cs b/HyPlayer.PlayCore.Abstraction/Models/AudioServiceSettingsBase.cs
@@ -2,7 +2,9 @@
 
 namespace HyPlayer.PlayCore.Abstraction.Models
 {
-    public class AudioServiceSettingsBase : IAudioServiceSettings
+    public abstract class AudioServiceSettingsBase : IAudioServiceSettings
     {
+        public abstract string DefaultOutputDeviceId { get; set; }
+        public abstract double OutputVolume { get; set; }
     }
 }
diff --git a/HyPlayer.PlayCore.Demo.AudioGraph.WinUI3/App.xaml.cs b/HyPlayer.PlayCore.Demo.AudioGraph.WinUI3/App.xaml.cs
@@ -8,8 +8,6 @@
 using HyPlayer.PlayCore.Implementation.AudioGraphService.Abstractions;
 using HyPlayer.PlayCore.Implementation.AudioGraphService.Abstractions.Notifications;
 using Microsoft.UI.Xaml;
-using Windows.Media.Audio;
-using Windows.Media.Render;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -29,7 +27,7 @@ public App()
         {
             this.InitializeComponent();
             var container = DepositoryFactory.CreateNew();
-            var settings = new AudioGraphServiceSettings() { AudioGraphSettings = new AudioGraphSettings(AudioRenderCategory.Media) };
+            var settings = new AudioGraphServiceSettings();
             container.AddSingleton<AudioServiceSettingsBase, AudioGraphServiceSettings>(settings);
             container.AddSingleton<AudioGraphService>();
             container.AddSingleton<INotificationHub, NotificationHub>();
diff --git a/HyPlayer.PlayCore.Implementation.AudioGraph/Abstractions/AudioGraphServiceSettings.cs b/HyPlayer.PlayCore.Implementation.AudioGraph/Abstractions/AudioGraphServiceSettings.cs
@@ -1,10 +1,26 @@
 ﻿using HyPlayer.PlayCore.Abstraction.Models;
+using System;
+using System.Threading.Tasks;
+using Windows.Devices.Enumeration;
 using Windows.Media.Audio;
 
 namespace HyPlayer.PlayCore.Implementation.AudioGraphService.Abstractions
 {
     public class AudioGraphServiceSettings : AudioServiceSettingsBase
     {
-        public AudioGraphSettings AudioGraphSettings { get; set; }
+        public override string DefaultOutputDeviceId { get; set; }
+        public override double OutputVolume { get; set; }
+        internal async Task<AudioGraphSettings> GetAudioGraphSettingsAsync()
+        {
+            if (!string.IsNullOrEmpty(DefaultOutputDeviceId))
+            {
+                var deviceInfomation = await DeviceInformation.CreateFromIdAsync(DefaultOutputDeviceId);
+                return new AudioGraphSettings(Windows.Media.Render.AudioRenderCategory.Media)
+                {
+                    PrimaryRenderDevice = deviceInfomation
+                };
+            }
+            else return new AudioGraphSettings(Windows.Media.Render.AudioRenderCategory.Media);
+        }
     }
 }
diff --git a/HyPlayer.PlayCore.Implementation.AudioGraph/Abstractions/Notifications/AudioGraphPlaybackPositionChangedNotification.cs b/HyPlayer.PlayCore.Implementation.AudioGraph/Abstractions/Notifications/AudioGraphPlaybackPositionChangedNotification.cs
@@ -1,6 +1,6 @@
 ﻿namespace HyPlayer.PlayCore.Implementation.AudioGraphService.Abstractions.Notifications
 {
-    public class AudioGraphPlaybackPositionChangedNotification:PlaybackPositionChangedNotification
+    public class AudioGraphPlaybackPositionChangedNotification : PlaybackPositionChangedNotification
     {
         public override double CurrentPlaybackPosition { get; init; }
         public AudioGraphPlaybackPositionChangedNotification(double currentPlaybackPosition)
diff --git a/HyPlayer.PlayCore.Implementation.AudioGraph/Abstractions/Notifications/AudioTicketReachesEndNotification.cs b/HyPlayer.PlayCore.Implementation.AudioGraph/Abstractions/Notifications/AudioTicketReachesEndNotification.cs
@@ -3,7 +3,7 @@
 
 namespace HyPlayer.PlayCore.Implementation.AudioGraphService.Abstractions.Notifications
 {
-    public class AudioGraphTicketReachesEndNotification:AudioTicketReachesEndNotification
+    public class AudioGraphTicketReachesEndNotification : AudioTicketReachesEndNotification
     {
         public override AudioTicketBase AudioGraphTicket { get; init; }
         public AudioGraphTicketReachesEndNotification(AudioGraphTicket ticket)
diff --git a/HyPlayer.PlayCore.Implementation.AudioGraph/AudioGraphService.cs b/HyPlayer.PlayCore.Implementation.AudioGraph/AudioGraphService.cs
@@ -38,7 +38,11 @@ public class AudioGraphService :
         public double OutgoingVolume
         {
             get => _outgoingVolume;
-            private set => _outgoingVolume = value;
+            private set
+            {
+                _outgoingVolume = value;
+                _audioGraphServiceSettings.OutputVolume = _outgoingVolume;
+            }
         }
 
         private double _outgoingVolume = 1d;
@@ -49,6 +53,8 @@ public double OutgoingVolume
 
         private AudioGraphSettings _audioGraphSettings;
 
+        private AudioGraphServiceSettings _audioGraphServiceSettings;
+
         private readonly List<AudioGraphTicket> _createdAudioTickets = [];
 
         private Dictionary<AudioGraphTicket, Task> _currentSeekingSessions = new();
@@ -237,10 +243,7 @@ public async Task SetOutputDevicesAsync(OutputDeviceBase device, CancellationTok
                 {
                     audioGraphServiceSettings = new AudioGraphServiceSettings()
                     {
-                        AudioGraphSettings = new AudioGraphSettings(Windows.Media.Render.AudioRenderCategory.Media)
-                        {
-                            PrimaryRenderDevice = outputDevice.DeviceInformation
-                        }
+                        DefaultOutputDeviceId = outputDevice.DeviceInformation.Id
                     };
                     await CreateAudioGraphFromSettings(audioGraphServiceSettings);
                 }
@@ -250,15 +253,16 @@ public async Task SetOutputDevicesAsync(OutputDeviceBase device, CancellationTok
             {
                 audioGraphServiceSettings = new AudioGraphServiceSettings()
                 {
-                    AudioGraphSettings = new AudioGraphSettings(Windows.Media.Render.AudioRenderCategory.Media)
+                    DefaultOutputDeviceId = null
                 };
                 await CreateAudioGraphFromSettings(audioGraphServiceSettings);
             }
 
         }
         private async Task CreateAudioGraphFromSettings(AudioGraphServiceSettings audioGraphServiceSettings)
         {
-            var newAudioGraphResult = await AudioGraph.CreateAsync(audioGraphServiceSettings.AudioGraphSettings);
+            var settings = await audioGraphServiceSettings.GetAudioGraphSettingsAsync();
+            var newAudioGraphResult = await AudioGraph.CreateAsync(settings);
             if (newAudioGraphResult.Status != AudioGraphCreationStatus.Success)
             {
                 throw newAudioGraphResult.ExtendedError;
@@ -379,7 +383,8 @@ public AudioGraphService(AudioServiceSettingsBase serviceSettings, INotification
         {
             if (serviceSettings is AudioGraphServiceSettings settings)
             {
-                _audioGraphSettings = settings.AudioGraphSettings;
+                _audioGraphServiceSettings = settings;
+                _audioGraphSettings = settings.GetAudioGraphSettingsAsync().GetAwaiter().GetResult();
             }
             _notificationHub = notificationHub;
             _positionNotifyTimer.Elapsed += OnPositionNotifyTimerElapsed;

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace HyPlayer.PlayCore.Abstraction.Models`
`4`	`4`	`{`
`5`		`- public class AudioServiceSettingsBase : IAudioServiceSettings`
	`5`	`+ public abstract class AudioServiceSettingsBase : IAudioServiceSettings`
`6`	`6`	`{`
	`7`	`+ public abstract string DefaultOutputDeviceId { get; set; }`
	`8`	`+ public abstract double OutputVolume { get; set; }`
`7`	`9`	`}`
`8`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace HyPlayer.PlayCore.Implementation.AudioGraphService.Abstractions.Notifications`
`2`	`2`	`{`
`3`		`- public class AudioGraphPlaybackPositionChangedNotification:PlaybackPositionChangedNotification`
	`3`	`+ public class AudioGraphPlaybackPositionChangedNotification : PlaybackPositionChangedNotification`
`4`	`4`	`{`
`5`	`5`	`public override double CurrentPlaybackPosition { get; init; }`
`6`	`6`	`public AudioGraphPlaybackPositionChangedNotification(double currentPlaybackPosition)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace HyPlayer.PlayCore.Implementation.AudioGraphService.Abstractions.Notifications`
`5`	`5`	`{`
`6`		`- public class AudioGraphTicketReachesEndNotification:AudioTicketReachesEndNotification`
	`6`	`+ public class AudioGraphTicketReachesEndNotification : AudioTicketReachesEndNotification`
`7`	`7`	`{`
`8`	`8`	`public override AudioTicketBase AudioGraphTicket { get; init; }`
`9`	`9`	`public AudioGraphTicketReachesEndNotification(AudioGraphTicket ticket)`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,11 @@ public class AudioGraphService :`
`38`	`38`	`public double OutgoingVolume`
`39`	`39`	`{`
`40`	`40`	`get => _outgoingVolume;`
`41`		`- private set => _outgoingVolume = value;`
	`41`	`+ private set`
	`42`	`+ {`
	`43`	`+ _outgoingVolume = value;`
	`44`	`+ _audioGraphServiceSettings.OutputVolume = _outgoingVolume;`
	`45`	`+ }`
`42`	`46`	`}`
`43`	`47`
`44`	`48`	`private double _outgoingVolume = 1d;`
`@@ -49,6 +53,8 @@ public double OutgoingVolume`
`49`	`53`
`50`	`54`	`private AudioGraphSettings _audioGraphSettings;`
`51`	`55`
	`56`	`+ private AudioGraphServiceSettings _audioGraphServiceSettings;`
	`57`	`+`
`52`	`58`	`private readonly List<AudioGraphTicket> _createdAudioTickets = [];`
`53`	`59`
`54`	`60`	`private Dictionary<AudioGraphTicket, Task> _currentSeekingSessions = new();`
`@@ -237,10 +243,7 @@ public async Task SetOutputDevicesAsync(OutputDeviceBase device, CancellationTok`
`237`	`243`	`{`
`238`	`244`	`audioGraphServiceSettings = new AudioGraphServiceSettings()`
`239`	`245`	`{`
`240`		`- AudioGraphSettings = new AudioGraphSettings(Windows.Media.Render.AudioRenderCategory.Media)`
`241`		`- {`
`242`		`- PrimaryRenderDevice = outputDevice.DeviceInformation`
`243`		`- }`
	`246`	`+ DefaultOutputDeviceId = outputDevice.DeviceInformation.Id`
`244`	`247`	`};`
`245`	`248`	`await CreateAudioGraphFromSettings(audioGraphServiceSettings);`
`246`	`249`	`}`
`@@ -250,15 +253,16 @@ public async Task SetOutputDevicesAsync(OutputDeviceBase device, CancellationTok`
`250`	`253`	`{`
`251`	`254`	`audioGraphServiceSettings = new AudioGraphServiceSettings()`
`252`	`255`	`{`
`253`		`- AudioGraphSettings = new AudioGraphSettings(Windows.Media.Render.AudioRenderCategory.Media)`
	`256`	`+ DefaultOutputDeviceId = null`
`254`	`257`	`};`
`255`	`258`	`await CreateAudioGraphFromSettings(audioGraphServiceSettings);`
`256`	`259`	`}`
`257`	`260`
`258`	`261`	`}`
`259`	`262`	`private async Task CreateAudioGraphFromSettings(AudioGraphServiceSettings audioGraphServiceSettings)`
`260`	`263`	`{`
`261`		`- var newAudioGraphResult = await AudioGraph.CreateAsync(audioGraphServiceSettings.AudioGraphSettings);`
	`264`	`+ var settings = await audioGraphServiceSettings.GetAudioGraphSettingsAsync();`
	`265`	`+ var newAudioGraphResult = await AudioGraph.CreateAsync(settings);`
`262`	`266`	`if (newAudioGraphResult.Status != AudioGraphCreationStatus.Success)`
`263`	`267`	`{`
`264`	`268`	`throw newAudioGraphResult.ExtendedError;`
`@@ -379,7 +383,8 @@ public AudioGraphService(AudioServiceSettingsBase serviceSettings, INotification`
`379`	`383`	`{`
`380`	`384`	`if (serviceSettings is AudioGraphServiceSettings settings)`
`381`	`385`	`{`
`382`		`- _audioGraphSettings = settings.AudioGraphSettings;`
	`386`	`+ _audioGraphServiceSettings = settings;`
	`387`	`+ _audioGraphSettings = settings.GetAudioGraphSettingsAsync().GetAwaiter().GetResult();`
`383`	`388`	`}`
`384`	`389`	`_notificationHub = notificationHub;`
`385`	`390`	`_positionNotifyTimer.Elapsed += OnPositionNotifyTimerElapsed;`