Skip to content

Fix Windows Autoplay bug #2238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheCodeTraveler merged 6 commits into from
Oct 3, 2024
Merged

Fix Windows Autoplay bug #2238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
28133f8
Fix Floating point number comparision bug with autoplay in `PlatformU…
ne0rrmatrix Sep 28, 2024
a55be92
Update how floating point numbers are compared
ne0rrmatrix Sep 28, 2024
8c65810
Refactor zero-checking logic with generic IsZero<TValue>
ne0rrmatrix Sep 29, 2024
c7e3919
Merge branch 'main' into FixWindowsAutoPlayBug
ne0rrmatrix Oct 1, 2024
53219ac
Merge branch 'main' into FixWindowsAutoPlayBug
TheCodeTraveler Oct 3, 2024
2e090fd
`dotnet format`
TheCodeTraveler Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.macios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ protected override MauiMediaElement CreatePlatformView()
Dispatcher.GetForCurrentThread() ?? throw new InvalidOperationException($"{nameof(IDispatcher)} cannot be null"));

(_, playerViewController) = mediaManager.CreatePlatformView();

return new(playerViewController, VirtualView);
}

Expand Down
2 changes: 1 addition & 1 deletion src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.macios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using AVKit;
using CommunityToolkit.Maui.Views;
using CommunityToolkit.Maui.Extensions;
using CommunityToolkit.Maui.Views;
using Microsoft.Maui.Controls.Handlers.Items;
using Microsoft.Maui.Handlers;
using UIKit;
Expand Down
13 changes: 9 additions & 4 deletions src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Diagnostics;
using System.Numerics;
using CommunityToolkit.Maui.Core.Primitives;
using CommunityToolkit.Maui.Views;
using Microsoft.Extensions.Logging;
Expand All @@ -8,7 +9,6 @@
using Windows.Media.Playback;
using Windows.Storage;
using Windows.System.Display;
using Page = Microsoft.Maui.Controls.Page;
using ParentWindow = CommunityToolkit.Maui.Extensions.PageExtensions.ParentWindow;
using WindowsMediaElement = Windows.Media.Playback.MediaPlayer;
using WinMediaSource = Windows.Media.Core.MediaSource;
Expand Down Expand Up @@ -160,12 +160,12 @@ protected virtual partial void PlatformUpdateSpeed()
Player.MediaPlayer.PlaybackRate = MediaElement.Speed;

// Only trigger once when going to the paused state
if (AreFloatingPointNumbersEqual(MediaElement.Speed, 0) && previousSpeed > 0)
if (IsZero<double>(MediaElement.Speed) && previousSpeed > 0)
{
Player.MediaPlayer.Pause();
}
// Only trigger once when we move from the paused state
else if (MediaElement.Speed > 0 && AreFloatingPointNumbersEqual(previousSpeed, 0))
else if (MediaElement.Speed > 0 && IsZero<double>(previousSpeed))
{
MediaElement.Play();
}
Expand Down Expand Up @@ -345,6 +345,11 @@ protected virtual void Dispose(bool disposing)
}
}

static bool IsZero<TValue>(TValue numericValue) where TValue : INumber<TValue>
{
return TValue.IsZero(numericValue);
}

async ValueTask UpdateMetadata()
{
if (systemMediaControls is null || Player is null)
Expand Down Expand Up @@ -485,7 +490,7 @@ void OnPlaybackSessionPlaybackStateChanged(MediaPlaybackSession sender, object a
};

MediaElement?.CurrentStateChanged(newState);
if (sender.PlaybackState == MediaPlaybackState.Playing && AreFloatingPointNumbersEqual(sender.PlaybackRate, 0))
if (sender.PlaybackState == MediaPlaybackState.Playing && IsZero<double>(sender.PlaybackRate))
{
Dispatcher.Dispatch(() =>
{
Expand Down