Added the ResetMedia method

Fixes #535
ZeBobo5 · Mar 27, 2019 · 0b48ffc · 0b48ffc
1 parent c916f66
commit 0b48ffc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/Vlc.DotNet.Core.Interops/VlcManager.SetMediaToMediaPlayer.cs b/src/Vlc.DotNet.Core.Interops/VlcManager.SetMediaToMediaPlayer.cs
@@ -9,9 +9,7 @@ public void SetMediaToMediaPlayer(VlcMediaPlayerInstance mediaPlayerInstance, Vl
         {
             if (mediaPlayerInstance == IntPtr.Zero)
                 throw new ArgumentException("Media player instance is not initialized.");
-            if (mediaInstance == IntPtr.Zero)
-                throw new ArgumentException("Media instance is not initialized.");
-            myLibraryLoader.GetInteropDelegate<SetMediaToMediaPlayer>().Invoke(mediaPlayerInstance, mediaInstance);
+            myLibraryLoader.GetInteropDelegate<SetMediaToMediaPlayer>().Invoke(mediaPlayerInstance, mediaInstance?.Pointer ?? IntPtr.Zero);
         }
     }
 }
diff --git a/src/Vlc.DotNet.Core/VlcMediaPlayer/VlcMediaPlayer.cs b/src/Vlc.DotNet.Core/VlcMediaPlayer/VlcMediaPlayer.cs
@@ -120,16 +120,21 @@ public VlcMedia SetMedia(Stream stream, params string[] options)
             return SetMedia(new VlcMedia(this, stream, options));
         }
 
+        public void ResetMedia()
+        {
+            SetMedia((VlcMedia)null);
+        }
+
         private VlcMedia SetMedia(VlcMedia media)
         {
             // If there is a previous media, dispose it.
             myCurrentMedia?.Dispose();
 
             // Set it to the media player.
-            Manager.SetMediaToMediaPlayer(myMediaPlayerInstance, media.MediaInstance);
+            Manager.SetMediaToMediaPlayer(myMediaPlayerInstance, media?.MediaInstance);
 
             // Register Events.
-            media.Initialize();
+            media?.Initialize();
             myCurrentMedia = media;
 
             return media;

diff --git a/src/Vlc.DotNet.Forms/VlcControl.cs b/src/Vlc.DotNet.Forms/VlcControl.cs
@@ -506,6 +506,11 @@ public void SetMedia(Stream stream, params string[] options)
             //EndInit();
             myVlcMediaPlayer.SetMedia(stream, options);
         }
+
+        public void ResetMedia()
+        {
+            myVlcMediaPlayer.ResetMedia();
+        }
         #endregion
     }
 }