IAudioManager add MusicVolume and program save MusicVolume/SoundVolume

NyagekiFumenProject · Oct 11, 2024 · 19b7692 · 19b7692
1 parent 4a4e685
commit 19b7692
Show file tree

Hide file tree

Showing 9 changed files with 258 additions and 175 deletions.
diff --git a/OngekiFumenEditor/App.config b/OngekiFumenEditor/App.config
@@ -45,6 +45,12 @@
             <setting name="AudioSampleRate" serializeAs="String">
                 <value>48000</value>
             </setting>
+            <setting name="MusicVolume" serializeAs="String">
+                <value>1</value>
+            </setting>
+            <setting name="SoundVolume" serializeAs="String">
+                <value>1</value>
+            </setting>
         </OngekiFumenEditor.Properties.AudioSetting>
         <OngekiFumenEditor.Properties.OptionGeneratorToolsSetting>
             <setting name="LastLoadedGameFolder" serializeAs="String">

diff --git a/OngekiFumenEditor/Kernel/Audio/IAudioManager.cs b/OngekiFumenEditor/Kernel/Audio/IAudioManager.cs
@@ -7,8 +7,9 @@ namespace OngekiFumenEditor.Kernel.Audio
 	public partial interface IAudioManager : IDisposable
 	{
 		float SoundVolume { get; set; }
+        float MusicVolume { get; set; }
 
-		Task<ISoundPlayer> LoadSoundAsync(string filePath);
+        Task<ISoundPlayer> LoadSoundAsync(string filePath);
 		Task<IAudioPlayer> LoadAudioAsync(string filePath);
 
 		IEnumerable<(string fileExt, string extDesc)> SupportAudioFileExtensionList { get; }

diff --git a/OngekiFumenEditor/Kernel/Audio/IAudioPlayer.cs b/OngekiFumenEditor/Kernel/Audio/IAudioPlayer.cs
@@ -16,15 +16,17 @@ public interface IAudioPlayer : IDisposable, INotifyPropertyChanged
 		/// </summary>
 		float Speed { get; set; }
 
+        /* control by IAudioManager
 		/// <summary>
 		/// 音量,0~1
 		/// </summary>
 		float Volume { get; set; }
+		*/
 
-		/// <summary>
-		/// 总长度,毫秒
-		/// </summary>
-		TimeSpan Duration { get; }
+        /// <summary>
+        /// 总长度,毫秒
+        /// </summary>
+        TimeSpan Duration { get; }
 
 		/// <summary>
 		/// 是否正在播放