zune/ZuneShell.dll
0
0
Fork 0
mirror of https://github.com/ZuneDev/ZuneShell.dll.git synced 2026-07-27 13:11:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

[WIP] Use callbacks for async

Browse Source
This commit is contained in:
Yoshi Askharoun
2025-07-11 23:15:06 -05:00
parent cf6ae6e31d
commit 1fa877ced8
3 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ZuneImpl/AsyncHelper.cs
+6 -6
View File
@@ -15,12 +15,12 @@ public static class AsyncHelper
t.Wait();
}
public static TResult Run<TResult>(Func<Task<TResult>> action)
{
Guard.IsNotNull(action);
public static TResult Run<TResult>(Func<Task<TResult>> action) => Run(action());
var t = Task.Run(action);
t.Wait();
return t.Result;
public static TResult Run<TResult>(Task<TResult> task)
{
Guard.IsNotNull(task);
return task.GetAwaiter().GetResult();
}
}
ZuneShell/ZuneUI/TransportControls/TransportControls.cs
+32 -25
View File
@@ -1854,40 +1854,47 @@ namespace ZuneUI
{
try
{
var stTrack = ((StrixPlaybackTrack)track).Track;
Application.DeferredInvoke(delegate
if (!IsDisposed && myID == _lastKnownSetUriCallID)
{
if (IsDisposed || myID != _lastKnownSetUriCallID)
return;
var stTrack = ((StrixPlaybackTrack)track).Track;
var source = ((StrixMusic.Sdk.AdapterModels.IMerged<StrixMusic.Sdk.CoreModels.ICoreTrack>)stTrack)
.Sources[0];
var mediaConfig = AsyncHelper.Run(() => source.SourceCore.GetMediaSourceAsync(source));
// This should set URIs, not necessarily begin playback
PlaybackItem playbackItem = new()
source.SourceCore.GetMediaSourceAsync(source).ContinueWith(task =>
{
Track = stTrack,
MediaConfig = mediaConfig,
};
ph.InsertNext(0, playbackItem);
ph.PlayFromNext(0);
//AsyncHelper.Run(dataRoot.Library.PlayTrackCollectionAsync(stTrack));
if (!task.IsCompleted || task.IsFaulted)
return;
if (mediaConfig.FileStreamSource != null)
_toDisposeOnEnd.Push(mediaConfig.FileStreamSource);
Application.DeferredInvoke(arg =>
{
var mediaConfig = (IMediaSourceConfig?)arg;
ReportStreamingAction(PlayerState.Stopped);
_tracksSubmittedToPlayer.Remove(track);
_tracksSubmittedToPlayer.Add(track);
if (nextTrack != null)
return;
// This should set URIs, not necessarily begin playback
PlaybackItem playbackItem = new()
{
Track = stTrack,
MediaConfig = mediaConfig,
};
ph.InsertNext(0, playbackItem);
ph.PlayFromNext(0);
//AsyncHelper.Run(dataRoot.Library.PlayTrackCollectionAsync(stTrack));
// TODO: _playbackWrapper.CancelNext();
//ph.ClearNext();
UpdatePropertiesAndCommands();
}, null);
if (mediaConfig.FileStreamSource != null)
_toDisposeOnEnd.Push(mediaConfig.FileStreamSource);
ReportStreamingAction(PlayerState.Stopped);
_tracksSubmittedToPlayer.Remove(track);
_tracksSubmittedToPlayer.Add(track);
if (nextTrack != null)
return;
// TODO: _playbackWrapper.CancelNext();
//ph.ClearNext();
UpdatePropertiesAndCommands();
}, task.Result);
});
}
}
catch (Exception ex)
{
libs/MicrosoftIris
+1 -1
Submodule libs/MicrosoftIris updated: 18dba59889...958a1024a1