From 44e377512ce2d4aedd1d8bc7876d2864a4e3df2e Mon Sep 17 00:00:00 2001
From: Martin Finkel <me@martinfinkel.com>
Date: Tue, 14 Jan 2025 13:40:58 +0700
Subject: [PATCH 1/3] XAML: Use concrete class instead of abstract class for
 TargetType in Style

https://github.com/dotnet/maui/issues/26672
---
 src/LibVLCSharp/Platforms/Windows/VideoViewBase.cs | 2 +-
 src/LibVLCSharp/Themes/Generic.xaml                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/LibVLCSharp/Platforms/Windows/VideoViewBase.cs b/src/LibVLCSharp/Platforms/Windows/VideoViewBase.cs
index 282b19ddd..6f6eb136c 100644
--- a/src/LibVLCSharp/Platforms/Windows/VideoViewBase.cs
+++ b/src/LibVLCSharp/Platforms/Windows/VideoViewBase.cs
@@ -40,7 +40,7 @@ public abstract class VideoViewBase : Control, IVideoView
         /// </summary>
         public VideoViewBase()
         {
-            DefaultStyleKey = typeof(VideoViewBase);
+            DefaultStyleKey = typeof(VideoView);
 
             Unloaded += (s, e) => DestroySwapChain();
 #if !WINUI
diff --git a/src/LibVLCSharp/Themes/Generic.xaml b/src/LibVLCSharp/Themes/Generic.xaml
index 7c1356034..1867e07ac 100644
--- a/src/LibVLCSharp/Themes/Generic.xaml
+++ b/src/LibVLCSharp/Themes/Generic.xaml
@@ -3,10 +3,10 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vlc="using:LibVLCSharp.Platforms.Windows">
 
-    <Style TargetType="vlc:VideoViewBase">
+    <Style TargetType="vlc:VideoView">
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="vlc:VideoViewBase">
+                <ControlTemplate TargetType="vlc:VideoView">
                     <SwapChainPanel x:Name="SwapChainPanel" />
                 </ControlTemplate>
             </Setter.Value>

From d903c4618b722704569aa128a7673ed678f10c5a Mon Sep 17 00:00:00 2001
From: Martin Finkel <me@martinfinkel.com>
Date: Tue, 14 Jan 2025 13:41:33 +0700
Subject: [PATCH 2/3] MAUI: Add WinUI support

# Conflicts:
#	src/LibVLCSharp.MAUI/Handlers/VideoViewHandler.cs
---
 src/LibVLCSharp.MAUI/Handlers/VideoViewHandler.cs | 2 ++
 src/LibVLCSharp.MAUI/LibVLCSharp.MAUI.csproj      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/LibVLCSharp.MAUI/Handlers/VideoViewHandler.cs b/src/LibVLCSharp.MAUI/Handlers/VideoViewHandler.cs
index 69b381302..2e6f6531a 100644
--- a/src/LibVLCSharp.MAUI/Handlers/VideoViewHandler.cs
+++ b/src/LibVLCSharp.MAUI/Handlers/VideoViewHandler.cs
@@ -3,6 +3,8 @@
 using VideoViewImpl = LibVLCSharp.VideoView;
 #elif IOS
 using VideoViewImpl = LibVLCSharp.VideoView;
+#elif WINUI
+using VideoViewImpl = LibVLCSharp.Platforms.Windows.VideoView;
 #endif 
 
 namespace LibVLCSharp.MAUI
diff --git a/src/LibVLCSharp.MAUI/LibVLCSharp.MAUI.csproj b/src/LibVLCSharp.MAUI/LibVLCSharp.MAUI.csproj
index 40905a1ed..8834955a8 100644
--- a/src/LibVLCSharp.MAUI/LibVLCSharp.MAUI.csproj
+++ b/src/LibVLCSharp.MAUI/LibVLCSharp.MAUI.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041</TargetFrameworks>
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>
     <ImplicitUsings>enable</ImplicitUsings>

From 026986338d636761ea05a81a8b016d3e8a6f936c Mon Sep 17 00:00:00 2001
From: Martin Finkel <me@martinfinkel.com>
Date: Tue, 14 Jan 2025 13:42:02 +0700
Subject: [PATCH 3/3] MAUI: Make samples work on WinUI

# Conflicts:
#	samples/LibVLCSharp.MAUI.Sample/MainViewModel.cs
---
 samples/LibVLCSharp.MAUI.Sample/AppShell.xaml |  7 +-----
 .../LibVLCSharp.MAUI.Sample.csproj            | 13 +++++++----
 samples/LibVLCSharp.MAUI.Sample/MainPage.xaml |  2 +-
 .../LibVLCSharp.MAUI.Sample/MainPage.xaml.cs  | 15 ++++++++++++
 .../LibVLCSharp.MAUI.Sample/MainViewModel.cs  |  6 +++--
 .../Properties/launchSettings.json            |  4 ++--
 ...ibVLCSharp.MAUI.Sample.MediaElement.csproj |  9 ++++----
 .../MainPage.xaml                             |  8 +++----
 .../MainPage.xaml.cs                          | 23 +++++++++++++++++--
 .../MainViewModel.cs                          | 14 +++++------
 .../Properties/launchSettings.json            |  4 ++--
 11 files changed, 70 insertions(+), 35 deletions(-)

diff --git a/samples/LibVLCSharp.MAUI.Sample/AppShell.xaml b/samples/LibVLCSharp.MAUI.Sample/AppShell.xaml
index 29de45141..ab6f069ae 100644
--- a/samples/LibVLCSharp.MAUI.Sample/AppShell.xaml
+++ b/samples/LibVLCSharp.MAUI.Sample/AppShell.xaml
@@ -5,10 +5,5 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:local="clr-namespace:LibVLCSharp.MAUI.Sample"
     Shell.FlyoutBehavior="Disabled">
-
-    <ShellContent
-        Title="Home"
-        ContentTemplate="{DataTemplate local:MainPage}"
-        Route="MainPage" />
-
+    <ShellContent ContentTemplate="{DataTemplate local:MainPage}" Route="MainPage" />
 </Shell>
diff --git a/samples/LibVLCSharp.MAUI.Sample/LibVLCSharp.MAUI.Sample.csproj b/samples/LibVLCSharp.MAUI.Sample/LibVLCSharp.MAUI.Sample.csproj
index 77b52e0a5..831be0b85 100644
--- a/samples/LibVLCSharp.MAUI.Sample/LibVLCSharp.MAUI.Sample.csproj
+++ b/samples/LibVLCSharp.MAUI.Sample/LibVLCSharp.MAUI.Sample.csproj
@@ -2,17 +2,17 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
 		<OutputType>Exe</OutputType>
 		<RootNamespace>LibVLCSharp.MAUI.Sample</RootNamespace>
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
-
 		<!-- Display name -->
-		<ApplicationTitle>LibVLCSharp.MAUI.Sample</ApplicationTitle>
-
+		<ApplicationTitle>LibVLCSharp.MAUI.SampleX</ApplicationTitle>
+		<WindowsPackageType>None</WindowsPackageType>
 		<!-- App Identifier -->
-		<ApplicationId>com.companyname.libvlcsharp.maui.sample</ApplicationId>
+		<ApplicationId>com.companyname.libvlcsharp.maui.samplex</ApplicationId>
 		<ApplicationIdGuid>49861f9e-48d3-45c0-b6a8-f591ad6d2010</ApplicationIdGuid>
 
 		<!-- Versions -->
@@ -24,7 +24,7 @@
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
+		<DefaultLanguage>en</DefaultLanguage>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -64,4 +64,7 @@
 	<ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
 		<PackageReference Include="VideoLAN.LibVLC.iOS" Version="3.3.18" />
 	</ItemGroup>
+	<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
+		<PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.21" />
+	</ItemGroup>
 </Project>
diff --git a/samples/LibVLCSharp.MAUI.Sample/MainPage.xaml b/samples/LibVLCSharp.MAUI.Sample/MainPage.xaml
index 4d9aaf385..a7c668182 100644
--- a/samples/LibVLCSharp.MAUI.Sample/MainPage.xaml
+++ b/samples/LibVLCSharp.MAUI.Sample/MainPage.xaml
@@ -8,6 +8,6 @@
         <local:MainViewModel />
     </ContentPage.BindingContext>
 
-    <shared:VideoView x:Name="VideoView" MediaPlayer="{Binding MediaPlayer}" MediaPlayerChanged="VideoView_MediaPlayerChanged"  HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand"/>
+    <shared:VideoView x:Name="VideoView" MediaPlayer="{Binding MediaPlayer}" MediaPlayerChanged="VideoView_MediaPlayerChanged"  HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HandlerChanged="VideoView_HandlerChanged" />
 
 </ContentPage>
diff --git a/samples/LibVLCSharp.MAUI.Sample/MainPage.xaml.cs b/samples/LibVLCSharp.MAUI.Sample/MainPage.xaml.cs
index 1a3346d96..d0802eef3 100644
--- a/samples/LibVLCSharp.MAUI.Sample/MainPage.xaml.cs
+++ b/samples/LibVLCSharp.MAUI.Sample/MainPage.xaml.cs
@@ -12,7 +12,9 @@ public MainPage()
         protected override void OnAppearing()
         {
             base.OnAppearing();
+#if !WINDOWS
             ((MainViewModel)BindingContext).OnAppearing();
+#endif
         }
 
         protected override void OnDisappearing()
@@ -25,5 +27,18 @@ private void VideoView_MediaPlayerChanged(object sender, MediaPlayerChangedEvent
         {
             ((MainViewModel)BindingContext).OnVideoViewInitialized();
         }
+
+        private void VideoView_HandlerChanged(object sender, EventArgs e)
+        {
+#if WINDOWS
+            var windowsView = ((LibVLCSharp.Platforms.Windows.VideoView)VideoView.Handler.PlatformView);
+
+            windowsView.Initialized += (s, e) =>
+            {
+                ((MainViewModel)BindingContext).Initialize(e.SwapChainOptions);
+                ((MainViewModel)BindingContext).OnAppearing();
+            };
+#endif
+        }
     }
 }
\ No newline at end of file
diff --git a/samples/LibVLCSharp.MAUI.Sample/MainViewModel.cs b/samples/LibVLCSharp.MAUI.Sample/MainViewModel.cs
index 725fefc07..88d4f8a73 100644
--- a/samples/LibVLCSharp.MAUI.Sample/MainViewModel.cs
+++ b/samples/LibVLCSharp.MAUI.Sample/MainViewModel.cs
@@ -9,7 +9,9 @@ public class MainViewModel : INotifyPropertyChanged
 
         public MainViewModel()
         {
+#if !WINDOWS
             Initialize();
+#endif
         }
 
         private LibVLC LibVLC { get; set; }
@@ -33,9 +35,9 @@ private void Set<T>(string propertyName, ref T field, T value)
             }
         }
 
-        private void Initialize()
+        internal void Initialize(string[] swapchainOptions = null)
         {
-            LibVLC = new LibVLC(enableDebugLogs: true);
+            LibVLC = new LibVLC(enableDebugLogs: true, swapchainOptions);
             using var media = new Media(new Uri("http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"));
 
             MediaPlayer = new MediaPlayer(LibVLC)
diff --git a/samples/LibVLCSharp.MAUI.Sample/Properties/launchSettings.json b/samples/LibVLCSharp.MAUI.Sample/Properties/launchSettings.json
index edf8aadcc..cebfae9cb 100644
--- a/samples/LibVLCSharp.MAUI.Sample/Properties/launchSettings.json
+++ b/samples/LibVLCSharp.MAUI.Sample/Properties/launchSettings.json
@@ -1,8 +1,8 @@
 {
   "profiles": {
     "Windows Machine": {
-      "commandName": "MsixPackage",
-      "nativeDebugging": false
+      "commandName": "Project",
+      "nativeDebugging": true
     }
   }
 }
\ No newline at end of file
diff --git a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/LibVLCSharp.MAUI.Sample.MediaElement.csproj b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/LibVLCSharp.MAUI.Sample.MediaElement.csproj
index b4b416ddf..e2524917d 100644
--- a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/LibVLCSharp.MAUI.Sample.MediaElement.csproj
+++ b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/LibVLCSharp.MAUI.Sample.MediaElement.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
-    <!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-    <!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
+	<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>LibVLCSharp.MAUI.Sample.MediaElement</RootNamespace>
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>latest</LangVersion>
+	<WindowsPackageType>None</WindowsPackageType>
     <!-- Display name -->
     <ApplicationTitle>LibVLCSharp.MAUI.Sample.MediaElement</ApplicationTitle>
     <!-- App Identifier -->
@@ -21,9 +21,7 @@
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
     <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
   </PropertyGroup>
   <ItemGroup>
     <!-- App Icon -->
@@ -49,6 +47,9 @@
 	<ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
 		<PackageReference Include="VideoLAN.LibVLC.iOS" Version="3.3.18" />
 	</ItemGroup>
+	<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
+		<PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.21" />
+	</ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\LibVLCSharp.MAUI\LibVLCSharp.MAUI.csproj" />
     <ProjectReference Include="..\..\..\src\LibVLCSharp\LibVLCSharp.csproj" />
diff --git a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/MainPage.xaml b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/MainPage.xaml
index 8477da926..176cc56af 100644
--- a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/MainPage.xaml
+++ b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/MainPage.xaml
@@ -4,17 +4,17 @@
              xmlns:local="clr-namespace:LibVLCSharp.MAUI.Sample.MediaElement"
              xmlns:vlc="clr-namespace:LibVLCSharp.MAUI;assembly=LibVLCSharp.MAUI"
              x:Class="LibVLCSharp.MAUI.Sample.MediaElement.MainPage"
-             Appearing="OnAppearing"
-             Disappearing="OnDisappearing">
+             Appearing="ContentPage_Appearing"
+             Disappearing="ContentPage_Disappearing">
 
     <ContentPage.BindingContext>
         <local:MainViewModel />
     </ContentPage.BindingContext>
 
-    <vlc:MediaPlayerElement MediaPlayer="{Binding MediaPlayer}" LibVLC="{Binding LibVLC}" EnableRendererDiscovery="True" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
+    <vlc:MediaPlayerElement x:Name="MediaPlayerElement" MediaPlayer="{Binding MediaPlayer}" LibVLC="{Binding LibVLC}" EnableRendererDiscovery="True" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
         <vlc:MediaPlayerElement.PlaybackControls>
             <vlc:PlaybackControls
-        	IsAspectRatioButtonVisible="True" IsSeekButtonVisible="True" IsCastButtonVisible="True" />
+        	IsAspectRatioButtonVisible="True" IsSeekButtonVisible="True" IsCastButtonVisible="True"/>
         </vlc:MediaPlayerElement.PlaybackControls>
 
     </vlc:MediaPlayerElement>
diff --git a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/MainPage.xaml.cs b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/MainPage.xaml.cs
index bccf31a82..d82c128c8 100644
--- a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/MainPage.xaml.cs
+++ b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/MainPage.xaml.cs
@@ -13,17 +13,36 @@ public partial class MainPage : ContentPage
         public MainPage()
         {
             InitializeComponent();
+            MediaPlayerElement.PlaybackControls.VideoView.HandlerChanged += VideoView_HandlerChanged;
         }
 
-        void OnAppearing(object sender, System.EventArgs e)
+        private void VideoView_HandlerChanged(object sender, EventArgs e)
+        {
+#if WINDOWS
+            var windowsView = ((LibVLCSharp.Platforms.Windows.VideoView)MediaPlayerElement.PlaybackControls.VideoView.Handler.PlatformView);
+
+            windowsView.Initialized += (s, e) =>
+            {
+                ((MainViewModel)BindingContext).OnAppearing(e.SwapChainOptions);
+            };
+#endif
+        }
+
+        private void ContentPage_Appearing(object sender, EventArgs e)
         {
             base.OnAppearing();
+#if !WINDOWS
             ((MainViewModel)BindingContext).OnAppearing();
+#endif
         }
 
-        void OnDisappearing(object sender, System.EventArgs e)
+        private void ContentPage_Disappearing(object sender, EventArgs e)
         {
             base.OnDisappearing();
+
+            // this is a hack to get the mediaplayer/libvlc objects databinding disabled before disposing of them in the viewmodel OnDisappearing function. The MediaElement control and MAUI lifecycle shutdown procedure don't play nice together, so sometimes, on destroy, media element events are being unsubscribed on an already disposed mediaplayer instance, causing a memory violation exception.
+            MediaPlayerElement.MediaPlayer = null;
+            MediaPlayerElement.LibVLC = null;
             ((MainViewModel)BindingContext).OnDisappearing();
         }
     }
diff --git a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/MainViewModel.cs b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/MainViewModel.cs
index 3ba16f9d7..850877686 100644
--- a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/MainViewModel.cs
+++ b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/MainViewModel.cs
@@ -46,11 +46,11 @@ public LibVLCSharp.MediaPlayer MediaPlayer
         /// <summary>
         /// Initialize LibVLC and playback when page appears
         /// </summary>
-        public void OnAppearing()
+        public void OnAppearing(string[] swapchainOptions = null)
         {
             if (LibVLC == null)
             {
-                LibVLC = new LibVLC(enableDebugLogs: true);
+                LibVLC = new LibVLC(enableDebugLogs: true, swapchainOptions);
             }
 
             if (MediaPlayer == null)
@@ -70,11 +70,11 @@ public void OnAppearing()
         /// </summary>
         public void OnDisappearing()
         {
-            MediaPlayer?.Dispose();
-            MediaPlayer = null;
-
-            LibVLC?.Dispose();
-            LibVLC = null;
+            _mediaPlayer?.Stop();
+            _mediaPlayer?.Dispose();
+            _mediaPlayer = null;
+            _libVLC?.Dispose();
+            _libVLC = null;
         }
 
         /// <summary>
diff --git a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/Properties/launchSettings.json b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/Properties/launchSettings.json
index edf8aadcc..cebfae9cb 100644
--- a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/Properties/launchSettings.json
+++ b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/Properties/launchSettings.json
@@ -1,8 +1,8 @@
 {
   "profiles": {
     "Windows Machine": {
-      "commandName": "MsixPackage",
-      "nativeDebugging": false
+      "commandName": "Project",
+      "nativeDebugging": true
     }
   }
 }
\ No newline at end of file