Release 5.03.2394.5

.nuke/build.schema.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Build Schema",
   "$ref": "#/definitions/build",
+  "title": "Build Schema",
   "definitions": {
     "build": {
       "type": "object",
@@ -207,4 +207,4 @@
       }
     }
   }
-}
+}

GitVersion.yml

@@ -5,7 +5,7 @@ branches:
   develop:
     regex: ^develop
     mode: ContinuousDeployment
-    tag: 'preview'
+    tag: 'alpha'
     increment: None
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
@@ -28,4 +28,4 @@ branches:
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
     tracks-release-branches: false
-    is-release-branch: false
+    is-release-branch: true

build/Build.cs

@@ -147,10 +147,16 @@ string BuildNumber
         .Executes(() =>
         {
             NuGetTasks.NuGetRestore(c => c.SetTargetPath(Solution));
-            MSBuild(s => s
-                .SetProcessToolPath(MsBuildPath)
+
+            var settings = new MSBuildSettings();
+            if (!string.IsNullOrWhiteSpace(MsBuildPath))
+                settings = settings.SetProcessToolPath(MsBuildPath);
+
+            settings = settings
                 .SetTargetPath(Solution)
-                .SetTargets("Restore"));
+                .SetTargets("Restore");
+
+            MSBuild(settings);
         });
 
     Target Version => _ => _
@@ -160,6 +166,7 @@ string BuildNumber
             GetVersion();
 
             Log.Information("Version: {_version}", _version);
+			Log.Information("Build number: {ver}", _buildNumber);
             var assemblyInfo = SourceDirectory / "AssemblyInfo.cs";
             if (File.Exists(assemblyInfo))
             {
@@ -184,8 +191,12 @@ string BuildNumber
         .Triggers(UpdateBuildNumber)
         .Executes(() =>
         {
-            MSBuild(s => s
-                .SetProcessToolPath(MsBuildPath)
+            var settings = new MSBuildSettings();
+
+            if (!string.IsNullOrWhiteSpace(MsBuildPath))
+                settings = settings.SetProcessToolPath(MsBuildPath);
+
+            settings = settings
                 .SetTargetPath(Solution)
                 .SetTargets("Rebuild")
                 .SetConfiguration(GetConfiguration())
@@ -194,7 +205,9 @@ string BuildNumber
                 .SetInformationalVersion($"{_version}-{GitRepository.Commit}")
                 .SetMaxCpuCount(Environment.ProcessorCount)
                 .SetNodeReuse(IsLocalBuild)
-                .SetTargetPlatform(TargetPlatform));
+                .SetTargetPlatform(TargetPlatform);
+
+            MSBuild(settings);
         });
 
     private Configuration GetConfiguration()

build_publish.cmd

@@ -0,0 +1,7 @@
+:; set -eo pipefail
+:; SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
+:; ${SCRIPT_DIR}/build.sh "$@"
+:; exit $?
+
+@ECHO OFF
+powershell -ExecutionPolicy ByPass -NoProfile -File "%~dp0build.ps1" %* Compile --MsBuildPath ''

src/Plugins/dotnet_demo/Extension/ExtensionPlaybackQueue.cs

@@ -0,0 +1,50 @@
+using AIMP.SDK;
+using AIMP.SDK.Player.Extensions;
+using AIMP.SDK.Player.Objects;
+using AIMP.SDK.Playlist.Objects;
+
+namespace DemoPlugin.Extension
+{
+    public class ExtensionPlaybackQueue : IAimpExtensionPlaybackQueue
+    {
+        private readonly IAimpPlayer _player;
+
+        public ExtensionPlaybackQueue(IAimpPlayer player)
+        {
+            _player = player;
+        }
+
+        public AimpActionResult GetNext(object current, PlaybackQueueFlags flags, IAimpPlaybackQueueItem queueItem)
+        {
+            if (queueItem.PlaylistItem != null)
+            {
+                System.Diagnostics.Debugger.Break();
+            }
+
+            return new AimpActionResult(ActionResultType.OK);
+        }
+
+        public AimpActionResult GetPrev(object current, PlaybackQueueFlags flags, IAimpPlaybackQueueItem queueItem)
+        {
+            if (queueItem.PlaylistItem != null)
+            {
+                System.Diagnostics.Debugger.Break();
+            }
+
+            return new AimpActionResult(ActionResultType.OK);
+        }
+
+        public void OnSelect(IAimpPlaylistItem item, IAimpPlaybackQueueItem queueItem)
+        {
+            if (queueItem.PlaylistItem != null)
+            {
+                System.Diagnostics.Debugger.Break();
+            }
+        }
+
+        public AimpActionResult<PlaybackQueueInfo> GetInfo(IAimpPlaylistItem item)
+        {
+            return new AimpActionResult<PlaybackQueueInfo>(ActionResultType.OK);
+        }
+    }
+}

src/Plugins/dotnet_demo/PlayerForm.cs

@@ -40,7 +40,7 @@ public PlayerForm(IAimpPlayer player, MessageHook coreMessage)
 
             coreMessage.OnCoreMessage += (message, param1, param2) =>
             {
-                System.Diagnostics.Debug.WriteLine($"message: {message}, param1: {(AimpCoreMessageType)param1}, param2: {param2}");
+                //System.Diagnostics.Debug.WriteLine($"message: {message}, param1: {(AimpCoreMessageType)param1}, param2: {param2}");
 
                 if (message == AimpCoreMessageType.EventPlayingFileInfo)
                 {

src/Plugins/dotnet_demo/Plugin.cs

@@ -22,6 +22,7 @@ namespace TestPlugin
     using AIMP.SDK;
     using AIMP.SDK.MenuManager;
     using AIMP.SDK.Options;
+    using DemoPlugin.Extension;
 
     public delegate ActionResultType HookMessage(AimpCoreMessageType message, int param1, IntPtr param2);
 
@@ -70,7 +71,11 @@ public override void Initialize()
             TestWriteConfig();
 
             var listner = new ExtensionPlaylistManagerListener();
-            Player.Core.RegisterExtension(listner);
+            var ext = new ExtensionPlaybackQueue(Player);
+
+            RegisterExtension(listner);
+            RegisterExtension(ext);
+
 
             var result = Player.Core.CreateObject<IAimpMenuItem>();
 
@@ -189,5 +194,15 @@ private void TestReadConfig()
                 var strData = System.Text.Encoding.Default.GetString(buf);
             }
         }
+
+        private void RegisterExtension(IAimpExtension extension)
+        {
+            var res = Player.Core.RegisterExtension(extension);
+
+            if (res.ResultType != ActionResultType.OK)
+            {
+                System.Diagnostics.Debugger.Break();
+            }
+        }
     }
 }

src/Plugins/dotnet_demo/dotnet_demo.csproj

@@ -96,6 +96,7 @@
     <Compile Include="..\..\AssemblyInfo.cs">
       <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Extension\ExtensionPlaybackQueue.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="LoggerForm.cs">
       <SubType>Form</SubType>
@@ -193,6 +194,7 @@
       <Name>aimp_dotnet</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>

src/SDK/AIMP.SDK/AIMP.SDK.csproj

@@ -219,6 +219,8 @@
     <Compile Include="SDK\Player\Extensions\IAimpExtensionPlaybackQueue.cs" />
     <Compile Include="SDK\Player\Extensions\IAimpExtensionPlaybackQueue2.cs" />
     <Compile Include="SDK\Player\Extensions\IAimpExtensionWaveFormProvider.cs" />
+    <Compile Include="SDK\Player\Extensions\PlaybackQueueFlags.cs" />
+    <Compile Include="SDK\Player\Extensions\PlaybackQueueInfo.cs" />
     <Compile Include="SDK\Player\IAimpServicePlaybackQueue2.cs" />
     <Compile Include="SDK\Player\Objects\IAimpEqualizerBands.cs" />
     <Compile Include="SDK\Player\Objects\IAimpEqualizerPreset.cs" />

src/SDK/AIMP.SDK/SDK/FileManager/Extensions/IAimpExtensionFileExpander.cs

@@ -29,6 +29,6 @@ public interface IAimpExtensionFileExpander : IAimpExtension
         /// <param name="fileName">The real file name</param>
         /// <param name="progressCallback">Progress callback <see cref="IAimpProgressCallback"/>.</param>
         /// <returns>AimpActionResult&lt;IList&lt;IAimpVirtualFile&gt;&gt;.</returns>
-        AimpActionResult<IAimpObjectList<IAimpVirtualFile>> Expand(string fileName, IAimpProgressCallback progressCallback);
+        AimpActionResult<IList<IAimpVirtualFile>> Expand(string fileName, IAimpProgressCallback progressCallback);
     }
 }

src/SDK/AIMP.SDK/SDK/FileManager/Objects/IAimpVirtualFile.cs

@@ -14,7 +14,7 @@ namespace AIMP.SDK.FileManager.Objects
     /// <summary>
     /// Interface provides information about virtual file.
     /// </summary>
-    public interface IAimpVirtualFile
+    public interface IAimpVirtualFile : IAimpObject
     {
         /// <summary>
         /// Gets or sets the index of virtual track in the set (if presented).
@@ -65,7 +65,7 @@ public interface IAimpVirtualFile
         /// Gets the file info.
         /// </summary>
         /// <returns>AimpActionResult&lt;IAimpFileInfo&gt;.</returns>
-        AimpActionResult<IAimpFileInfo> GetFileInfo();
+        AimpActionResult GetFileInfo(IAimpFileInfo fileInfo);
 
         /// <summary>
         /// Check is the source exists.

src/SDK/AIMP.SDK/SDK/MessageDispatcher/AimpMessages.cs

@@ -10,6 +10,8 @@
 // ReSharper disable InconsistentNaming
 // ReSharper disable UnusedMember.Global
 
+using System;
+
 namespace AIMP.SDK.MessageDispatcher
 {
     /// <summary>
@@ -929,6 +931,7 @@ public enum AimpCoreMessageType
         #endregion
     }
 
+    [Flags]
     public enum AimpMessage
     {
         EndOfQueue = 1,

src/SDK/AIMP.SDK/SDK/MessageDispatcher/IAimpServiceMessageDispatcher.cs

@@ -43,6 +43,21 @@ public interface IAimpServiceMessageDispatcher : IAimpService
         /// <returns>AimpActionResult.</returns>
         AimpActionResult Send(AimpCoreMessageType message, int param1, ref IntPtr param2);
 
+        /// <summary>
+        /// Sends the specified message.
+        /// </summary>
+        /// <param name="message">The message <see cref="AimpCoreMessageType" />.</param>
+        /// <returns>AimpActionResult.</returns>
+        AimpActionResult Send(AimpCoreMessageType message);
+
+        /// <summary>
+        /// Sends the specified message.
+        /// </summary>
+        /// <param name="message">The message <see cref="AimpCoreMessageType" />.</param>
+        /// <param name="param1">The message direction <see cref="MessageDirectionType" />.</param>
+        /// <returns>AimpActionResult.</returns>
+        AimpActionResult Send(AimpCoreMessageType message, int param1);
+
         /// <summary>
         /// Registers the specified message.
         /// </summary>

src/SDK/AIMP.SDK/SDK/Player/Extensions/IAimpExtensionPlaybackQueue.cs

@@ -12,27 +12,6 @@
 
 namespace AIMP.SDK.Player.Extensions
 {
-    /// <summary>
-    /// Enum PlaybackQueueFlags
-    /// </summary>
-    public enum PlaybackQueueFlags
-    {
-        /// <summary>
-        /// The start from beginning
-        /// </summary>
-        StartFromBeginning = 1,
-
-        /// <summary>
-        /// The start from cursor
-        /// </summary>
-        StartFromCursor = 2,
-
-        /// <summary>
-        /// The start from item
-        /// </summary>
-        StartFromItem = 3
-    }
-
     /// <summary>
     /// Interface IAimpExtensionPlaybackQueue
     /// Implements the <see cref="AIMP.SDK.IAimpExtension" />

src/SDK/AIMP.SDK/SDK/Player/Extensions/IAimpExtensionPlaybackQueue2.cs

@@ -11,13 +11,6 @@
 
 namespace AIMP.SDK.Player.Extensions;
 
-public class PlaybackQueueInfo
-{
-    public int Position { get; }
-
-    public int Size { get; }
-}
-
 /// <summary>
 /// Extends an abilities of the <see cref="IAimpExtensionPlaybackQueue"/>.
 /// </summary>

src/SDK/AIMP.SDK/SDK/Player/Extensions/PlaybackQueueFlags.cs

@@ -0,0 +1,22 @@
+namespace AIMP.SDK.Player.Extensions;
+
+/// <summary>
+/// Enum PlaybackQueueFlags
+/// </summary>
+public enum PlaybackQueueFlags
+{
+    /// <summary>
+    /// The start from beginning
+    /// </summary>
+    StartFromBeginning = 1,
+
+    /// <summary>
+    /// The start from cursor
+    /// </summary>
+    StartFromCursor = 2,
+
+    /// <summary>
+    /// The start from item
+    /// </summary>
+    StartFromItem = 3
+}

src/SDK/AIMP.SDK/SDK/Player/Extensions/PlaybackQueueInfo.cs

@@ -0,0 +1,8 @@
+namespace AIMP.SDK.Player.Extensions;
+
+public class PlaybackQueueInfo
+{
+    public int Position { get; }
+
+    public int Size { get; }
+}

src/SDK/AIMP.SDK/SDK/Player/Objects/IAimpPlaybackQueueItem.cs

@@ -27,5 +27,7 @@ public interface IAimpPlaybackQueueItem
         /// </summary>
         /// <value>The playlist item.</value>
         IAimpPlaylistItem PlaylistItem { get; set; }
+
+        double Offset { get; set; }
     }
 }

src/SDK/aimp_dotnet/AIMPSDK/AIMP400/apiFileManager.h

@@ -139,7 +139,7 @@ class IAIMPVirtualFile: public IAIMPPropertyList
 	public:
 		virtual HRESULT WINAPI CreateStream(IAIMPStream **Stream) = 0;
 		virtual HRESULT WINAPI GetFileInfo(IAIMPFileInfo *Info) = 0;
-		virtual HRESULT WINAPI IsExists() = 0;
+		virtual boolean WINAPI IsExists() = 0;
 		virtual HRESULT WINAPI IsInSameStream(IAIMPVirtualFile *VirtualFile) = 0;
 		virtual HRESULT WINAPI Synchronize() = 0;
 };

src/SDK/aimp_dotnet/Aimp_DotNetPlugin.vcxproj

@@ -59,6 +59,7 @@
     <ClCompile Include="SDK\FileManager\Extensions\InternalAimpExtensionFileFormat.cpp" />
     <ClCompile Include="SDK\FileManager\Extensions\InternalAimpExtensionFileInfoProvider.cpp" />
     <ClCompile Include="SDK\FileManager\Extensions\InternalAimpExtensionFileSystem.cpp" />
+    <ClCompile Include="SDK\FileManager\InternalAimpVirtualFile.cpp" />
     <ClCompile Include="SDK\FileManager\Services\AimpServiceFileURI.cpp" />
     <ClCompile Include="SDK\FileManager\Services\AimpServiceFileURI2.cpp" />
     <ClCompile Include="SDK\Internet\AimpServiceConnectionSettings.cpp" />
@@ -198,6 +199,7 @@
     <ClInclude Include="SDK\FileManager\AimpServiceFileStreaming.h" />
     <ClInclude Include="SDK\FileManager\AimpServiceFileSystems.h" />
     <ClInclude Include="SDK\FileManager\AimpVirtualFile.h" />
+    <ClInclude Include="SDK\FileManager\InternalAimpVirtualFile.h" />
     <ClInclude Include="SDK\FileManager\Commands\AimpFileSystemCommandCopyToClipboard.h" />
     <ClInclude Include="SDK\FileManager\Commands\AimpFileSystemCommandDelete.h" />
     <ClInclude Include="SDK\FileManager\Commands\AimpFileSystemCommandDropSource.h" />