Merge pull request #13 from HyPlayer/audio-graph-service

[Implementation] Implementation of AudioGraph

.github/workflows/nuget-push.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
       - name: Restore dependencies
         run: dotnet restore
       - name: Build
@@ -30,7 +30,7 @@ jobs:
           dotnet pack HyPlayer.PlayCore.Abstraction/HyPlayer.PlayCore.Abstraction.csproj -c Release -o Packages/
 
       - name: Publish Packages to Artifacts
-        uses: actions/upload-artifact@v3.1.1
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: packages
           path: Packages

.github/workflows/qodana-analyze.yml

@@ -15,6 +15,6 @@ jobs:
         with:
           fetch-depth: 0
       - name: "Qodana Scan"
-        uses: JetBrains/qodana-action@v2023.2.1
+        uses: JetBrains/qodana-action@v2024.1.8
         env:
           QODANA_TOKEN: ${{secrets.QODANA_TOKEN}}

HyPlayer.PlayCore.Abstraction/AudioServiceBase.cs

@@ -1,5 +1,4 @@
-using System.Collections.ObjectModel;
-using HyPlayer.PlayCore.Abstraction.Models.AudioServiceComponents;
+using HyPlayer.PlayCore.Abstraction.Models.AudioServiceComponents;
 using HyPlayer.PlayCore.Abstraction.Models.Resources;
 
 namespace HyPlayer.PlayCore.Abstraction;

HyPlayer.PlayCore.Abstraction/Interfaces/AudioServices/IAudioServiceSettings.cs

@@ -0,0 +1,7 @@
+namespace HyPlayer.PlayCore.Abstraction.Interfaces.AudioServices
+{
+    public interface IAudioServiceSettings
+    {
+
+    }
+}

HyPlayer.PlayCore.Abstraction/Interfaces/AudioServices/IAudioTicketListProvidable.cs

@@ -1,5 +1,4 @@
-using System.Collections.ObjectModel;
-using HyPlayer.PlayCore.Abstraction.Models.AudioServiceComponents;
+using HyPlayer.PlayCore.Abstraction.Models.AudioServiceComponents;
 
 namespace HyPlayer.PlayCore.Abstraction.Interfaces.AudioServices;
 

HyPlayer.PlayCore.Abstraction/Interfaces/AudioServices/IAudioTicketSeekable.cs

@@ -7,5 +7,5 @@ namespace HyPlayer.PlayCore.Abstraction.Interfaces.AudioServices;
 /// </summary>
 public interface IAudioTicketSeekableService : IAudioService
 {
-    public Task SeekAudioTicketAsync(AudioTicketBase audioTicket, long position, CancellationToken ctk = new());
+    public Task SeekAudioTicketAsync(AudioTicketBase audioTicket, double position, CancellationToken ctk = new());
 }

HyPlayer.PlayCore.Abstraction/Interfaces/AudioServices/IOutputDeviceService.cs

@@ -9,7 +9,7 @@ public interface IOutputDeviceChangeableService : IAudioService
     /// 获取可输出设备列表
     /// </summary>
     /// <returns></returns>
-    public Task<List<OutputDeviceBase>> GetOutputDevicesAsync( CancellationToken ctk = new());
+    public Task<List<OutputDeviceBase>> GetOutputDevicesAsync(CancellationToken ctk = new());
 
     /// <summary>
     /// 设置输出设备

HyPlayer.PlayCore.Abstraction/Interfaces/Lyric/ILyricProcessor.cs

@@ -1,5 +1,4 @@
-using System.Collections.ObjectModel;
-using HyPlayer.PlayCore.Abstraction.Models.Lyric;
+using HyPlayer.PlayCore.Abstraction.Models.Lyric;
 
 namespace HyPlayer.PlayCore.Abstraction.Interfaces.Lyric;
 

HyPlayer.PlayCore.Abstraction/Interfaces/PlayCore/IPlayCore.PlayPositionModification.cs

@@ -5,6 +5,6 @@ namespace HyPlayer.PlayCore.Abstraction.Interfaces.PlayCore;
 public interface IPlayCorePlayPositionModification : IPlayCore
 {
     public Task MovePointerToAsync(SingleSongBase song, CancellationToken ctk = new());
-    public Task MoveNextAsync( CancellationToken ctk = new());
-    public Task MovePreviousAsync( CancellationToken ctk = new());
+    public Task MoveNextAsync(CancellationToken ctk = new());
+    public Task MovePreviousAsync(CancellationToken ctk = new());
 }

HyPlayer.PlayCore.Abstraction/Interfaces/PlayCore/IPlayCore.PlaylistModification.cs

@@ -1,5 +1,4 @@
-using System.Collections.ObjectModel;
-using HyPlayer.PlayCore.Abstraction.Models;
+using HyPlayer.PlayCore.Abstraction.Models;
 using HyPlayer.PlayCore.Abstraction.Models.SingleItems;
 
 namespace HyPlayer.PlayCore.Abstraction.Interfaces.PlayCore;

HyPlayer.PlayCore.Abstraction/Interfaces/PlayCore/IPlayCore.Services.cs

@@ -1,6 +1,4 @@
-using System.Collections.ObjectModel;
-
-namespace HyPlayer.PlayCore.Abstraction.Interfaces.PlayCore;
+namespace HyPlayer.PlayCore.Abstraction.Interfaces.PlayCore;
 
 public interface IPlayCoreService : IPlayCore
 {

HyPlayer.PlayCore.Abstraction/Interfaces/PlayListContainer/IProgressiveLoadingContainer.cs

@@ -1,5 +1,4 @@
-using System.Collections.ObjectModel;
-using HyPlayer.PlayCore.Abstraction.Models;
+using HyPlayer.PlayCore.Abstraction.Models;
 
 namespace HyPlayer.PlayCore.Abstraction.Interfaces.PlayListContainer;
 

HyPlayer.PlayCore.Abstraction/Interfaces/PlayListController/IIndexedPlayListController.cs

@@ -4,6 +4,6 @@ namespace HyPlayer.PlayCore.Abstraction.Interfaces.PlayListController;
 
 public interface IIndexedPlayListController : IPlaylistController
 {
-    public Task<int> GetCurrentIndexAsync( CancellationToken ctk = new());
+    public Task<int> GetCurrentIndexAsync(CancellationToken ctk = new());
     public Task<SingleSongBase?> GetSongAtAsync(int index, CancellationToken ctk = new());
 }

HyPlayer.PlayCore.Abstraction/Interfaces/PlayListController/IPlayListGettablePlaylistController.cs

@@ -1,9 +1,8 @@
-using System.Collections.ObjectModel;
-using HyPlayer.PlayCore.Abstraction.Models.SingleItems;
+using HyPlayer.PlayCore.Abstraction.Models.SingleItems;
 
 namespace HyPlayer.PlayCore.Abstraction.Interfaces.PlayListController;
 
 public interface IPlayListGettablePlaylistController : IPlaylistController
 {
-    public Task<List<SingleSongBase>> GetOrderedPlayListAsync( CancellationToken ctk = new());
+    public Task<List<SingleSongBase>> GetOrderedPlayListAsync(CancellationToken ctk = new());
 }

HyPlayer.PlayCore.Abstraction/Interfaces/PlayListController/IRandomizablePlayListController.cs

@@ -1,5 +1,4 @@
-using System.Collections.ObjectModel;
-using HyPlayer.PlayCore.Abstraction.Models.SingleItems;
+using HyPlayer.PlayCore.Abstraction.Models.SingleItems;
 
 namespace HyPlayer.PlayCore.Abstraction.Interfaces.PlayListController;
 

HyPlayer.PlayCore.Abstraction/Interfaces/ProvidableItem/IHasCover.cs

@@ -5,5 +5,5 @@ namespace HyPlayer.PlayCore.Abstraction.Interfaces.ProvidableItem;
 
 public interface IHasCover : IProvidableItem
 {
-    public Task<ImageResourceBase?> GetCoverAsync( CancellationToken ctk = new());
+    public Task<ImageResourceBase?> GetCoverAsync(CancellationToken ctk = new());
 }

HyPlayer.PlayCore.Abstraction/Interfaces/ProvidableItem/IHasCreators.cs

@@ -1,11 +1,10 @@
-using System.Collections.ObjectModel;
-using HyPlayer.PlayCore.Abstraction.Models;
+using HyPlayer.PlayCore.Abstraction.Models;
 using HyPlayer.PlayCore.Abstraction.Models.Containers;
 
 namespace HyPlayer.PlayCore.Abstraction.Interfaces.ProvidableItem;
 
 public interface IHasCreators : IProvidableItem
 {
     public List<string>? CreatorList { get; init; }
-    public Task<List<PersonBase>?> GetCreatorsAsync( CancellationToken ctk = new());
+    public Task<List<PersonBase>?> GetCreatorsAsync(CancellationToken ctk = new());
 }

HyPlayer.PlayCore.Abstraction/Interfaces/ProvidableItem/IHasTag.cs

@@ -1,5 +1,4 @@
-using System.Collections.ObjectModel;
-using HyPlayer.PlayCore.Abstraction.Models;
+using HyPlayer.PlayCore.Abstraction.Models;
 
 namespace HyPlayer.PlayCore.Abstraction.Interfaces.ProvidableItem;
 

HyPlayer.PlayCore.Abstraction/Interfaces/Provider/ICommentProvidable.cs

@@ -4,5 +4,5 @@ namespace HyPlayer.PlayCore.Abstraction.Interfaces.Provider;
 
 public interface ICommentProvidable : IProvider
 {
-    public Task<ContainerBase?> GetCommentContainerAsync( CancellationToken ctk = new());
+    public Task<ContainerBase?> GetCommentContainerAsync(CancellationToken ctk = new());
 }

HyPlayer.PlayCore.Abstraction/Interfaces/Provider/IProvableItemLikable.cs

@@ -1,5 +1,3 @@
-using System.Collections.ObjectModel;
-
 namespace HyPlayer.PlayCore.Abstraction.Interfaces.Provider;
 
 public interface IProvableItemLikable : IProvider

HyPlayer.PlayCore.Abstraction/Interfaces/Provider/IProvidableItemRangeProvidable.cs

@@ -1,4 +1,3 @@
-using System.Collections.ObjectModel;
 using HyPlayer.PlayCore.Abstraction.Models;
 
 namespace HyPlayer.PlayCore.Abstraction.Interfaces.Provider;

HyPlayer.PlayCore.Abstraction/Interfaces/Provider/ISearchableProvider.cs

@@ -4,5 +4,5 @@ namespace HyPlayer.PlayCore.Abstraction.Interfaces.Provider;
 
 public interface ISearchableProvider : IProvider
 {
-    public Task<ContainerBase?> SearchProvidableItemsAsync(string keyword,string typeId, CancellationToken ctk = new());
+    public Task<ContainerBase?> SearchProvidableItemsAsync(string keyword, string typeId, CancellationToken ctk = new());
 }

HyPlayer.PlayCore.Abstraction/Models/AudioServiceSettingsBase.cs

@@ -0,0 +1,10 @@
+using HyPlayer.PlayCore.Abstraction.Interfaces.AudioServices;
+
+namespace HyPlayer.PlayCore.Abstraction.Models
+{
+    public abstract class AudioServiceSettingsBase : IAudioServiceSettings
+    {
+        public abstract string DefaultOutputDeviceId { get; set; }
+        public abstract double OutputVolume { get; set; }
+    }
+}

HyPlayer.PlayCore.Abstraction/Models/Containers/ContainersContainer.cs

@@ -1,6 +1,4 @@
-using System.Collections.ObjectModel;
-
-namespace HyPlayer.PlayCore.Abstraction.Models.Containers;
+namespace HyPlayer.PlayCore.Abstraction.Models.Containers;
 
 public abstract class ContainersContainer : ContainerBase
 {

HyPlayer.PlayCore.Abstraction/Models/Containers/LinerContainerBase.cs

@@ -1,6 +1,4 @@
-using System.Collections.ObjectModel;
-
-namespace HyPlayer.PlayCore.Abstraction.Models.Containers;
+namespace HyPlayer.PlayCore.Abstraction.Models.Containers;
 
 public abstract class LinerContainerBase : ContainerBase
 {

HyPlayer.PlayCore.Abstraction/Models/Lyric/ProcessedWordLyricLine.cs

@@ -1,6 +1,4 @@
-using System.Collections.ObjectModel;
-
-namespace HyPlayer.PlayCore.Abstraction.Models.Lyric;
+namespace HyPlayer.PlayCore.Abstraction.Models.Lyric;
 
 public class ProcessedWordLyricLine : ProcessedLyricLine
 {

HyPlayer.PlayCore.Abstraction/Models/Notifications/AudioTicketReachesEndNotification.cs

@@ -0,0 +1,9 @@
+using HyPlayer.PlayCore.Abstraction.Models.AudioServiceComponents;
+
+namespace HyPlayer.PlayCore.Abstraction.Models.Notifications
+{
+    public abstract class AudioTicketReachesEndNotification
+    {
+        public abstract AudioTicketBase AudioGraphTicket { get; init; }
+    }
+}

HyPlayer.PlayCore.Abstraction/Models/Notifications/InnerPlayListChangedNotification.cs

@@ -1,7 +1,4 @@
-using System.Collections.ObjectModel;
-using HyPlayer.PlayCore.Abstraction.Models.SingleItems;
-
-namespace HyPlayer.PlayCore.Abstraction.Models.Notifications;
+namespace HyPlayer.PlayCore.Abstraction.Models.Notifications;
 
 public class InnerPlayListChangedNotification : NotificationBase
 {

HyPlayer.PlayCore.Abstraction/Models/Notifications/MasterTicketChangedNotification.cs

@@ -0,0 +1,9 @@
+using HyPlayer.PlayCore.Abstraction.Models.AudioServiceComponents;
+
+namespace HyPlayer.PlayCore.Abstraction.Models.Notifications
+{
+    public abstract class MasterTicketChangedNotification
+    {
+        public abstract AudioTicketBase MasterTicket { get; init; }
+    }
+}

HyPlayer.PlayCore.Abstraction/Models/Notifications/PlaybackPositionChangedNotification.cs

@@ -0,0 +1,7 @@
+namespace HyPlayer.PlayCore.Abstraction.Models.Notifications
+{
+    public abstract class PlaybackPositionChangedNotification
+    {
+        public abstract double CurrentPlaybackPosition { get; init; }
+    }
+}

HyPlayer.PlayCore.Abstraction/Models/ResourceBase.cs

@@ -4,14 +4,19 @@ namespace HyPlayer.PlayCore.Abstraction.Models;
 
 public abstract class ResourceBase
 {
-    public string? Url { get; set; }
+    public Uri? Uri { get; set; }
     public string? ResourceName { get; set; }
     public bool HasContent { get; set; }
     public string? ExtensionName { get; set; }
     public abstract ResourceType Type { get; }
-    public abstract Task<object?> GetResourceAsync(ResourceQualityTag? qualityTag = null, Type? awaitingType = null, CancellationToken ctk = new());
+    public abstract Task<ResourceResultBase> GetResourceAsync(ResourceQualityTag? qualityTag = null, CancellationToken ctk = new());
 }
 
+public abstract class ResourceResultBase
+{
+    public abstract required Exception ExternalException { get; init; }
+    public abstract required ResourceStatus ResourceStatus { get; init; }
+}
 public enum ResourceType
 {
     None,
@@ -20,4 +25,10 @@ public enum ResourceType
     Video,
     Audio,
     Binary,
+}
+
+public enum ResourceStatus
+{
+    Success,
+    Fail
 }

HyPlayer.PlayCore.Abstraction/PlayControllerBase.cs

@@ -1,6 +1,4 @@
-using System.Collections.ObjectModel;
-using HyPlayer.PlayCore.Abstraction.Models;
-using HyPlayer.PlayCore.Abstraction.Models.SingleItems;
+using HyPlayer.PlayCore.Abstraction.Models.SingleItems;
 
 namespace HyPlayer.PlayCore.Abstraction;
 

HyPlayer.PlayCore.Abstraction/PlayCoreBase.cs

@@ -1,5 +1,4 @@
-using System.Collections.ObjectModel;
-using HyPlayer.PlayCore.Abstraction.Interfaces.PlayCore;
+using HyPlayer.PlayCore.Abstraction.Interfaces.PlayCore;
 using HyPlayer.PlayCore.Abstraction.Models;
 using HyPlayer.PlayCore.Abstraction.Models.AudioServiceComponents;
 using HyPlayer.PlayCore.Abstraction.Models.SingleItems;

HyPlayer.PlayCore.Abstraction/PlayListManagerBase.cs

@@ -1,5 +1,4 @@
-using System.Runtime.CompilerServices;
-using HyPlayer.PlayCore.Abstraction.Models;
+using HyPlayer.PlayCore.Abstraction.Models;
 using HyPlayer.PlayCore.Abstraction.Models.SingleItems;
 
 namespace HyPlayer.PlayCore.Abstraction;

HyPlayer.PlayCore.Abstraction/ProviderBase.cs

@@ -1,6 +1,4 @@
-using HyPlayer.PlayCore.Abstraction.Interfaces.Provider;
-
-namespace HyPlayer.PlayCore.Abstraction;
+namespace HyPlayer.PlayCore.Abstraction;
 
 public abstract class ProviderBase : IProvider
 {

HyPlayer.PlayCore.Benchmark/HyPlayer.PlayCore.Benchmark.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

HyPlayer.PlayCore.Demo.AudioGraph.WinUI3/App.xaml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application
+    x:Class="HyPlayer.PlayCore.Demo.AudioGraph.WinUI3.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:HyPlayer.PlayCore.Demo.AudioGraph.WinUI3">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+                <!-- Other merged dictionaries here -->
+                <ResourceDictionary Source="/Converters/ConverterDictionary.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <!-- Other app resources here -->
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>