Adjustments to libvlcsharp 4

mfkl · mfkl · commit b8d32ff849ea · 2024-11-25T23:36:00.000+07:00
diff --git a/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/MainViewModel.cs b/samples/MAUI/LibVLCSharp.MAUI.Sample.MediaElement/MainViewModel.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
-using LibVLCSharp.Shared;
+using LibVLCSharp;
 
 namespace LibVLCSharp.MAUI.Sample.MediaElement
 {
@@ -25,19 +25,19 @@ public MainViewModel()
         private LibVLC _libVLC;
 		
         /// <summary>
-        /// Gets the <see cref="LibVLCSharp.Shared.LibVLC"/> instance.
+        /// Gets the <see cref="LibVLCSharp.LibVLC"/> instance.
         /// </summary>
         public LibVLC LibVLC
         {
             get => _libVLC;
             private set => SetProperty(ref _libVLC, value);
         }
 
-        private LibVLCSharp.Shared.MediaPlayer _mediaPlayer;
+        private LibVLCSharp.MediaPlayer _mediaPlayer;
         /// <summary>
-        /// Gets the <see cref="LibVLCSharp.Shared.MediaPlayer"/> instance.
+        /// Gets the <see cref="LibVLCSharp.MediaPlayer"/> instance.
         /// </summary>
-        public LibVLCSharp.Shared.MediaPlayer MediaPlayer
+        public LibVLCSharp.MediaPlayer MediaPlayer
         {
             get => _mediaPlayer;
             private set => SetProperty(ref _mediaPlayer, value);
@@ -55,8 +55,8 @@ public void OnAppearing()
 
             if (MediaPlayer == null)
             {
-                var media = new Media(LibVLC, new Uri("http://streams.videolan.org/streams/mkv/multiple_tracks.mkv"));
-                MediaPlayer = new LibVLCSharp.Shared.MediaPlayer(media)
+                var media = new Media(new Uri("http://streams.videolan.org/streams/mkv/multiple_tracks.mkv"));
+                MediaPlayer = new MediaPlayer(LibVLC)
                 {
                     EnableHardwareDecoding = true
                 };
diff --git a/src/LibVLCSharp.MAUI/Dispatcher.cs b/src/LibVLCSharp.MAUI/Dispatcher.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Threading.Tasks;
-using LibVLCSharp.Shared.MediaPlayerElement;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui;
 
@@ -9,7 +8,7 @@ namespace LibVLCSharp.MAUI
     /// <summary>
     /// Object that provides services for managing the queue of work items for a thread
     /// </summary>
-    internal class Dispatcher : Shared.MediaPlayerElement.IDispatcher
+    internal class Dispatcher : LibVLCSharp.MediaPlayerElement.IDispatcher
     {
         /// <summary>
         /// Schedules the provided callback on the UI thread from a worker thread
diff --git a/src/LibVLCSharp.MAUI/DisplayInformation.cs b/src/LibVLCSharp.MAUI/DisplayInformation.cs
@@ -1,4 +1,4 @@
-﻿using LibVLCSharp.Shared.MediaPlayerElement;
+﻿using LibVLCSharp.MediaPlayerElement;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui;
 
diff --git a/src/LibVLCSharp.MAUI/DisplayRequest.cs b/src/LibVLCSharp.MAUI/DisplayRequest.cs
@@ -1,4 +1,4 @@
-﻿using LibVLCSharp.Shared.MediaPlayerElement;
+﻿using LibVLCSharp.MediaPlayerElement;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui;
 
diff --git a/src/LibVLCSharp.MAUI/MediaPlayerElement.xaml.cs b/src/LibVLCSharp.MAUI/MediaPlayerElement.xaml.cs
@@ -1,5 +1,5 @@
 ﻿using System;
-using LibVLCSharp.Shared;
+using LibVLCSharp;
 using Microsoft.Maui.Controls.Xaml;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Storage;
@@ -66,7 +66,7 @@ public static void RegisterPageLifecycleEvents()
     }
 
     /// <summary>
-    /// Represents an object that uses a <see cref="LibVLCSharp.Shared.MediaPlayer"/> to render audio and video to the display.
+    /// Represents an object that uses a <see cref="LibVLCSharp.MediaPlayer"/> to render audio and video to the display.
     /// </summary>
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class MediaPlayerElement : ContentView
@@ -89,7 +89,7 @@ public MediaPlayerElement()
             typeof(MediaPlayerElement), propertyChanged: LibVLCPropertyChanged);
 
         /// <summary>
-        /// Gets the <see cref="LibVLCSharp.Shared.LibVLC"/> instance.
+        /// Gets the <see cref="LibVLCSharp.LibVLC"/> instance.
         /// </summary>
         public LibVLC LibVLC
         {
@@ -101,14 +101,14 @@ public LibVLC LibVLC
         /// Identifies the <see cref="MediaPlayer"/> dependency property.
         /// </summary>
         public static readonly BindableProperty MediaPlayerProperty = BindableProperty.Create(nameof(MediaPlayer),
-            typeof(LibVLCSharp.Shared.MediaPlayer), typeof(MediaPlayerElement), propertyChanged: MediaPlayerPropertyChanged);
+            typeof(LibVLCSharp.MediaPlayer), typeof(MediaPlayerElement), propertyChanged: MediaPlayerPropertyChanged);
 
         /// <summary>
-        /// Gets the <see cref="LibVLCSharp.Shared.MediaPlayer"/> instance.
+        /// Gets the <see cref="LibVLCSharp.MediaPlayer"/> instance.
         /// </summary>
-        public LibVLCSharp.Shared.MediaPlayer MediaPlayer
+        public LibVLCSharp.MediaPlayer MediaPlayer
         {
-            get => (LibVLCSharp.Shared.MediaPlayer)GetValue(MediaPlayerProperty);
+            get => (LibVLCSharp.MediaPlayer)GetValue(MediaPlayerProperty);
             set => SetValue(MediaPlayerProperty, value);
         }
 
@@ -173,7 +173,7 @@ private void OnLibVLCChanged(LibVLC libVLC)
             }
         }
 
-        private void OnMediaPlayerChanged(LibVLCSharp.Shared.MediaPlayer mediaPlayer)
+        private void OnMediaPlayerChanged(LibVLCSharp.MediaPlayer mediaPlayer)
         {
             var videoView = VideoView;
             if (videoView != null)
@@ -219,7 +219,7 @@ private static void LibVLCPropertyChanged(BindableObject bindable, object oldVal
 
         private static void MediaPlayerPropertyChanged(BindableObject bindable, object oldValue, object newValue)
         {
-            ((MediaPlayerElement)bindable).OnMediaPlayerChanged((LibVLCSharp.Shared.MediaPlayer)newValue);
+            ((MediaPlayerElement)bindable).OnMediaPlayerChanged((LibVLCSharp.MediaPlayer)newValue);
         }
 
         private static void PlaybackControlsPropertyChanged(BindableObject bindable, object oldValue, object newValue)
@@ -301,7 +301,7 @@ private void OnPageDisappearing(object? sender, EventArgs e)
                     if (Preferences.Get($"VLC_{mediaPlayer.NativeReference}_MediaPlayerElement_IsPlaying", false))
                     {
                         mediaPlayer.Play();
-                        mediaPlayer.Position = Preferences.Get($"VLC_{mediaPlayer.NativeReference}_MediaPlayerElement_Position", 0f);
+                        mediaPlayer.SetPosition(Preferences.Get($"VLC_{mediaPlayer.NativeReference}_MediaPlayerElement_Position", 0f));
                     }
                 }
             }
diff --git a/src/LibVLCSharp.MAUI/PlaybackControls.xaml.cs b/src/LibVLCSharp.MAUI/PlaybackControls.xaml.cs
@@ -4,8 +4,8 @@
 using System.Resources;
 using System.Threading.Tasks;
 using LibVLCSharp.MAUI.Resources;
-using LibVLCSharp.Shared;
-using LibVLCSharp.Shared.MediaPlayerElement;
+using LibVLCSharp;
+using LibVLCSharp.MediaPlayerElement;
 using Microsoft.Maui.Controls.Xaml;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Controls;
@@ -14,7 +14,7 @@
 namespace LibVLCSharp.MAUI
 {
     /// <summary>
-    /// Represents the playback controls for a <see cref="LibVLCSharp.Shared.MediaPlayer"/>.
+    /// Represents the playback controls for a <see cref="LibVLCSharp.MediaPlayer"/>.
     /// </summary>
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class PlaybackControls : TemplatedView
@@ -483,7 +483,7 @@ public View ButtonBarEndArea
         public static readonly BindableProperty LibVLCProperty = BindableProperty.Create(nameof(LibVLC), typeof(LibVLC), typeof(PlaybackControls),
             propertyChanged: LibVLCPropertyChanged);
         /// <summary>
-        /// Gets or sets the <see cref="LibVLCSharp.Shared.LibVLC"/> instance.
+        /// Gets or sets the <see cref="LibVLCSharp.LibVLC"/> instance.
         /// </summary>
         public LibVLC LibVLC
         {
@@ -495,13 +495,13 @@ public LibVLC LibVLC
         /// Identifies the <see cref="MediaPlayer"/> dependency property.
         /// </summary>
         public static readonly BindableProperty MediaPlayerProperty = BindableProperty.Create(nameof(MediaPlayer),
-            typeof(LibVLCSharp.Shared.MediaPlayer), typeof(PlaybackControls), propertyChanged: MediaPlayerPropertyChanged);
+            typeof(LibVLCSharp.MediaPlayer), typeof(PlaybackControls), propertyChanged: MediaPlayerPropertyChanged);
         /// <summary>
-        /// Gets or sets the <see cref="LibVLCSharp.Shared.MediaPlayer"/> instance.
+        /// Gets or sets the <see cref="LibVLCSharp.MediaPlayer"/> instance.
         /// </summary>
-        public LibVLCSharp.Shared.MediaPlayer MediaPlayer
+        public LibVLCSharp.MediaPlayer MediaPlayer
         {
-            get => (LibVLCSharp.Shared.MediaPlayer)GetValue(MediaPlayerProperty);
+            get => (LibVLCSharp.MediaPlayer)GetValue(MediaPlayerProperty);
             set => SetValue(MediaPlayerProperty, value);
         }
 
@@ -868,7 +868,7 @@ private static void LibVLCPropertyChanged(BindableObject bindable, object? oldVa
 
         private static void MediaPlayerPropertyChanged(BindableObject bindable, object? oldValue, object newValue)
         {
-            ((PlaybackControls)bindable).Manager.MediaPlayer = (LibVLCSharp.Shared.MediaPlayer)newValue;
+            ((PlaybackControls)bindable).Manager.MediaPlayer = (LibVLCSharp.MediaPlayer)newValue;
         }
 
         private void OnBuffering()
@@ -961,12 +961,12 @@ private void SelectTrack(TracksManager manager, TrackViewModel track, ListView?
                     return;
             
                 var foundTrack = tracks.First(t => t.Id == track.Id);
-                manager.CurrentTrackId = foundTrack.Id;
+                manager.CurrentTrackId = foundTrack.Id!;
                 PlaybackControls.UpdateTracksListviewItemsSource(track, tracksListview);
             }
             catch (Exception)
             {
-                manager.CurrentTrackId = -1;
+                manager.CurrentTrackId = "-1";
             }     
         }
 
@@ -992,7 +992,7 @@ private ObservableCollection<TrackViewModel> LoadTracks(TracksManager manager)
                     var currentTrackId = manager.CurrentTrackId;
                     foreach (var track in tracks)
                     {
-                        var trackViewModel = new TrackViewModel(track.Id, track.Name);
+                        var trackViewModel = new TrackViewModel(track.Id!, track.Name!);
 
                         if (track.Id == currentTrackId)
                             trackViewModel.Selected = true;
@@ -1097,7 +1097,7 @@ private void RewindButton_Clicked(object? sender, EventArgs e)
                 return;
             }
 
-            mediaPlayer.Time -= SEEK_OFFSET;
+            mediaPlayer.SetTime(mediaPlayer.Time - SEEK_OFFSET);
         }
 
         private void SeekButton_Clicked(object? sender, EventArgs e)
@@ -1108,7 +1108,7 @@ private void SeekButton_Clicked(object? sender, EventArgs e)
                 return;
             }
 
-            mediaPlayer.Time += SEEK_OFFSET;
+            mediaPlayer.SetTime(mediaPlayer.Time + SEEK_OFFSET);
         }
 
         private Button? SetClickEventHandler(string name, EventHandler eventHandler, bool fadeIn = false)
@@ -1158,9 +1158,9 @@ private void UpdateTracksSelectionAvailability(TracksManager tracksManager, Butt
         {
             if (tracksSelectionButton != null)
             {
-                var c = tracksManager.Tracks?.Where(t => t.Id != -1).Count();
+                var c = tracksManager.Tracks?.Where(t => t.Id != null && !t.Id.Equals("-1")).Count();
                 UpdateTracksSelectionButtonAvailability(tracksSelectionButton,
-                    tracksManager.Tracks?.Where(t => t.Id != -1).Count() >= count ? availableState : unavailableState);
+                    tracksManager.Tracks?.Where(t => t.Id != null && !t.Id.Equals("-1")).Count() >= count ? availableState : unavailableState);
             }
         }
 
diff --git a/src/LibVLCSharp.MAUI/TrackViewModel.cs b/src/LibVLCSharp.MAUI/TrackViewModel.cs
@@ -11,7 +11,7 @@ public class TrackViewModel : INotifyPropertyChanged
         /// <summary>
         /// Track description Id
         /// </summary>
-        public int Id { get; set; }
+        public string Id { get; set; }
 
         /// <summary>
         /// Track description
@@ -37,7 +37,7 @@ public bool Selected
         /// </summary>
         /// <param name="id">Track description Id</param>
         /// <param name="name">Track description</param>
-        internal TrackViewModel(int id, string name)
+        internal TrackViewModel(string id, string name)
         {
             Id = id;
             Name = name;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using LibVLCSharp.Shared.MediaPlayerElement;`
	`1`	`+using LibVLCSharp.MediaPlayerElement;`
`2`	`2`	`using Microsoft.Maui.Controls;`
`3`	`3`	`using Microsoft.Maui;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`using System;`
`2`		`-using LibVLCSharp.Shared;`
	`2`	`+using LibVLCSharp;`
`3`	`3`	`using Microsoft.Maui.Controls.Xaml;`
`4`	`4`	`using Microsoft.Maui.Controls;`
`5`	`5`	`using Microsoft.Maui.Storage;`
`@@ -66,7 +66,7 @@ public static void RegisterPageLifecycleEvents()`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`/// <summary>`
`69`		`- /// Represents an object that uses a <see cref="LibVLCSharp.Shared.MediaPlayer"/> to render audio and video to the display.`
	`69`	`+ /// Represents an object that uses a <see cref="LibVLCSharp.MediaPlayer"/> to render audio and video to the display.`
`70`	`70`	`/// </summary>`
`71`	`71`	`[XamlCompilation(XamlCompilationOptions.Compile)]`
`72`	`72`	`public partial class MediaPlayerElement : ContentView`
`@@ -89,7 +89,7 @@ public MediaPlayerElement()`
`89`	`89`	`typeof(MediaPlayerElement), propertyChanged: LibVLCPropertyChanged);`
`90`	`90`
`91`	`91`	`/// <summary>`
`92`		`- /// Gets the <see cref="LibVLCSharp.Shared.LibVLC"/> instance.`
	`92`	`+ /// Gets the <see cref="LibVLCSharp.LibVLC"/> instance.`
`93`	`93`	`/// </summary>`
`94`	`94`	`public LibVLC LibVLC`
`95`	`95`	`{`
`@@ -101,14 +101,14 @@ public LibVLC LibVLC`
`101`	`101`	`/// Identifies the <see cref="MediaPlayer"/> dependency property.`
`102`	`102`	`/// </summary>`
`103`	`103`	`public static readonly BindableProperty MediaPlayerProperty = BindableProperty.Create(nameof(MediaPlayer),`
`104`		`- typeof(LibVLCSharp.Shared.MediaPlayer), typeof(MediaPlayerElement), propertyChanged: MediaPlayerPropertyChanged);`
	`104`	`+ typeof(LibVLCSharp.MediaPlayer), typeof(MediaPlayerElement), propertyChanged: MediaPlayerPropertyChanged);`
`105`	`105`
`106`	`106`	`/// <summary>`
`107`		`- /// Gets the <see cref="LibVLCSharp.Shared.MediaPlayer"/> instance.`
	`107`	`+ /// Gets the <see cref="LibVLCSharp.MediaPlayer"/> instance.`
`108`	`108`	`/// </summary>`
`109`		`- public LibVLCSharp.Shared.MediaPlayer MediaPlayer`
	`109`	`+ public LibVLCSharp.MediaPlayer MediaPlayer`
`110`	`110`	`{`
`111`		`- get => (LibVLCSharp.Shared.MediaPlayer)GetValue(MediaPlayerProperty);`
	`111`	`+ get => (LibVLCSharp.MediaPlayer)GetValue(MediaPlayerProperty);`
`112`	`112`	`set => SetValue(MediaPlayerProperty, value);`
`113`	`113`	`}`
`114`	`114`
`@@ -173,7 +173,7 @@ private void OnLibVLCChanged(LibVLC libVLC)`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`
`176`		`- private void OnMediaPlayerChanged(LibVLCSharp.Shared.MediaPlayer mediaPlayer)`
	`176`	`+ private void OnMediaPlayerChanged(LibVLCSharp.MediaPlayer mediaPlayer)`
`177`	`177`	`{`
`178`	`178`	`var videoView = VideoView;`
`179`	`179`	`if (videoView != null)`
`@@ -219,7 +219,7 @@ private static void LibVLCPropertyChanged(BindableObject bindable, object oldVal`
`219`	`219`
`220`	`220`	`private static void MediaPlayerPropertyChanged(BindableObject bindable, object oldValue, object newValue)`
`221`	`221`	`{`
`222`		`- ((MediaPlayerElement)bindable).OnMediaPlayerChanged((LibVLCSharp.Shared.MediaPlayer)newValue);`
	`222`	`+ ((MediaPlayerElement)bindable).OnMediaPlayerChanged((LibVLCSharp.MediaPlayer)newValue);`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`private static void PlaybackControlsPropertyChanged(BindableObject bindable, object oldValue, object newValue)`
`@@ -301,7 +301,7 @@ private void OnPageDisappearing(object? sender, EventArgs e)`
`301`	`301`	`if (Preferences.Get($"VLC_{mediaPlayer.NativeReference}_MediaPlayerElement_IsPlaying", false))`
`302`	`302`	`{`
`303`	`303`	`mediaPlayer.Play();`
`304`		`- mediaPlayer.Position = Preferences.Get($"VLC_{mediaPlayer.NativeReference}_MediaPlayerElement_Position", 0f);`
	`304`	`+ mediaPlayer.SetPosition(Preferences.Get($"VLC_{mediaPlayer.NativeReference}_MediaPlayerElement_Position", 0f));`
`305`	`305`	`}`
`306`	`306`	`}`
`307`	`307`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`	`using System.Resources;`
`5`	`5`	`using System.Threading.Tasks;`
`6`	`6`	`using LibVLCSharp.MAUI.Resources;`
`7`		`-using LibVLCSharp.Shared;`
`8`		`-using LibVLCSharp.Shared.MediaPlayerElement;`
	`7`	`+using LibVLCSharp;`
	`8`	`+using LibVLCSharp.MediaPlayerElement;`
`9`	`9`	`using Microsoft.Maui.Controls.Xaml;`
`10`	`10`	`using Microsoft.Maui.Graphics;`
`11`	`11`	`using Microsoft.Maui.Controls;`
`@@ -14,7 +14,7 @@`
`14`	`14`	`namespace LibVLCSharp.MAUI`
`15`	`15`	`{`
`16`	`16`	`/// <summary>`
`17`		`- /// Represents the playback controls for a <see cref="LibVLCSharp.Shared.MediaPlayer"/>.`
	`17`	`+ /// Represents the playback controls for a <see cref="LibVLCSharp.MediaPlayer"/>.`
`18`	`18`	`/// </summary>`
`19`	`19`	`[XamlCompilation(XamlCompilationOptions.Compile)]`
`20`	`20`	`public partial class PlaybackControls : TemplatedView`
`@@ -483,7 +483,7 @@ public View ButtonBarEndArea`
`483`	`483`	`public static readonly BindableProperty LibVLCProperty = BindableProperty.Create(nameof(LibVLC), typeof(LibVLC), typeof(PlaybackControls),`
`484`	`484`	`propertyChanged: LibVLCPropertyChanged);`
`485`	`485`	`/// <summary>`
`486`		`- /// Gets or sets the <see cref="LibVLCSharp.Shared.LibVLC"/> instance.`
	`486`	`+ /// Gets or sets the <see cref="LibVLCSharp.LibVLC"/> instance.`
`487`	`487`	`/// </summary>`
`488`	`488`	`public LibVLC LibVLC`
`489`	`489`	`{`
`@@ -495,13 +495,13 @@ public LibVLC LibVLC`
`495`	`495`	`/// Identifies the <see cref="MediaPlayer"/> dependency property.`
`496`	`496`	`/// </summary>`
`497`	`497`	`public static readonly BindableProperty MediaPlayerProperty = BindableProperty.Create(nameof(MediaPlayer),`
`498`		`- typeof(LibVLCSharp.Shared.MediaPlayer), typeof(PlaybackControls), propertyChanged: MediaPlayerPropertyChanged);`
	`498`	`+ typeof(LibVLCSharp.MediaPlayer), typeof(PlaybackControls), propertyChanged: MediaPlayerPropertyChanged);`
`499`	`499`	`/// <summary>`
`500`		`- /// Gets or sets the <see cref="LibVLCSharp.Shared.MediaPlayer"/> instance.`
	`500`	`+ /// Gets or sets the <see cref="LibVLCSharp.MediaPlayer"/> instance.`
`501`	`501`	`/// </summary>`
`502`		`- public LibVLCSharp.Shared.MediaPlayer MediaPlayer`
	`502`	`+ public LibVLCSharp.MediaPlayer MediaPlayer`
`503`	`503`	`{`
`504`		`- get => (LibVLCSharp.Shared.MediaPlayer)GetValue(MediaPlayerProperty);`
	`504`	`+ get => (LibVLCSharp.MediaPlayer)GetValue(MediaPlayerProperty);`
`505`	`505`	`set => SetValue(MediaPlayerProperty, value);`
`506`	`506`	`}`
`507`	`507`
`@@ -868,7 +868,7 @@ private static void LibVLCPropertyChanged(BindableObject bindable, object? oldVa`
`868`	`868`
`869`	`869`	`private static void MediaPlayerPropertyChanged(BindableObject bindable, object? oldValue, object newValue)`
`870`	`870`	`{`
`871`		`- ((PlaybackControls)bindable).Manager.MediaPlayer = (LibVLCSharp.Shared.MediaPlayer)newValue;`
	`871`	`+ ((PlaybackControls)bindable).Manager.MediaPlayer = (LibVLCSharp.MediaPlayer)newValue;`
`872`	`872`	`}`
`873`	`873`
`874`	`874`	`private void OnBuffering()`
`@@ -961,12 +961,12 @@ private void SelectTrack(TracksManager manager, TrackViewModel track, ListView?`
`961`	`961`	`return;`
`962`	`962`
`963`	`963`	`var foundTrack = tracks.First(t => t.Id == track.Id);`
`964`		`- manager.CurrentTrackId = foundTrack.Id;`
	`964`	`+ manager.CurrentTrackId = foundTrack.Id!;`
`965`	`965`	`PlaybackControls.UpdateTracksListviewItemsSource(track, tracksListview);`
`966`	`966`	`}`
`967`	`967`	`catch (Exception)`
`968`	`968`	`{`
`969`		`- manager.CurrentTrackId = -1;`
	`969`	`+ manager.CurrentTrackId = "-1";`
`970`	`970`	`}`
`971`	`971`	`}`
`972`	`972`
`@@ -992,7 +992,7 @@ private ObservableCollection<TrackViewModel> LoadTracks(TracksManager manager)`
`992`	`992`	`var currentTrackId = manager.CurrentTrackId;`
`993`	`993`	`foreach (var track in tracks)`
`994`	`994`	`{`
`995`		`- var trackViewModel = new TrackViewModel(track.Id, track.Name);`
	`995`	`+ var trackViewModel = new TrackViewModel(track.Id!, track.Name!);`
`996`	`996`
`997`	`997`	`if (track.Id == currentTrackId)`
`998`	`998`	`trackViewModel.Selected = true;`
`@@ -1097,7 +1097,7 @@ private void RewindButton_Clicked(object? sender, EventArgs e)`
`1097`	`1097`	`return;`
`1098`	`1098`	`}`
`1099`	`1099`
`1100`		`- mediaPlayer.Time -= SEEK_OFFSET;`
	`1100`	`+ mediaPlayer.SetTime(mediaPlayer.Time - SEEK_OFFSET);`
`1101`	`1101`	`}`
`1102`	`1102`
`1103`	`1103`	`private void SeekButton_Clicked(object? sender, EventArgs e)`
`@@ -1108,7 +1108,7 @@ private void SeekButton_Clicked(object? sender, EventArgs e)`
`1108`	`1108`	`return;`
`1109`	`1109`	`}`
`1110`	`1110`
`1111`		`- mediaPlayer.Time += SEEK_OFFSET;`
	`1111`	`+ mediaPlayer.SetTime(mediaPlayer.Time + SEEK_OFFSET);`
`1112`	`1112`	`}`
`1113`	`1113`
`1114`	`1114`	`private Button? SetClickEventHandler(string name, EventHandler eventHandler, bool fadeIn = false)`
`@@ -1158,9 +1158,9 @@ private void UpdateTracksSelectionAvailability(TracksManager tracksManager, Butt`
`1158`	`1158`	`{`
`1159`	`1159`	`if (tracksSelectionButton != null)`
`1160`	`1160`	`{`
`1161`		`- var c = tracksManager.Tracks?.Where(t => t.Id != -1).Count();`
	`1161`	`+ var c = tracksManager.Tracks?.Where(t => t.Id != null && !t.Id.Equals("-1")).Count();`
`1162`	`1162`	`UpdateTracksSelectionButtonAvailability(tracksSelectionButton,`
`1163`		`- tracksManager.Tracks?.Where(t => t.Id != -1).Count() >= count ? availableState : unavailableState);`
	`1163`	`+ tracksManager.Tracks?.Where(t => t.Id != null && !t.Id.Equals("-1")).Count() >= count ? availableState : unavailableState);`
`1164`	`1164`	`}`
`1165`	`1165`	`}`
`1166`	`1166`