change InteropObjectInstance Dispose(bool) access modifier to protected

tdhieu · May 16, 2015 · 09e715b · 09e715b
1 parent 5b71478
commit 09e715b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/src/Vlc.DotNet.Core.Interops/Signatures/InteropObjectInstance.cs b/src/Vlc.DotNet.Core.Interops/Signatures/InteropObjectInstance.cs
@@ -19,12 +19,13 @@ public void Dispose()
                 return;
             myIsDisposing = true;
             Dispose(true);
+
+            GC.SuppressFinalize(this);
         }
 
-        public virtual void Dispose(bool disposing)
+        protected virtual void Dispose(bool disposing)
         {
             Pointer = IntPtr.Zero;
-            GC.SuppressFinalize(this);
         }
 
         ~InteropObjectInstance()

diff --git a/src/Vlc.DotNet.Core.Interops/VlcEventManagerInstance.cs b/src/Vlc.DotNet.Core.Interops/VlcEventManagerInstance.cs
@@ -12,7 +12,7 @@ internal VlcEventManagerInstance(VlcManager manager, IntPtr pointer) : base(poin
             myManager = manager;
         }
 
-        public override void Dispose(bool disposing)
+        protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);
         }

diff --git a/src/Vlc.DotNet.Core.Interops/VlcInstance.cs b/src/Vlc.DotNet.Core.Interops/VlcInstance.cs
@@ -12,7 +12,7 @@ internal VlcInstance(VlcManager manager, IntPtr pointer) : base(pointer)
             myManager = manager;
         }
 
-        public override void Dispose(bool disposing)
+        protected override void Dispose(bool disposing)
         {
             if (Pointer != IntPtr.Zero)
                 myManager.ReleaseInstance(this);

diff --git a/src/Vlc.DotNet.Core.Interops/VlcMediaInstance.cs b/src/Vlc.DotNet.Core.Interops/VlcMediaInstance.cs
@@ -12,7 +12,7 @@ internal VlcMediaInstance(VlcManager manager, IntPtr pointer) : base(pointer)
             myManager = manager;
         }
 
-        public override void Dispose(bool disposing)
+        protected override void Dispose(bool disposing)
         {
             if (Pointer != IntPtr.Zero)
                 myManager.ReleaseMedia(this);

diff --git a/src/Vlc.DotNet.Core.Interops/VlcMediaPlayerInstance.cs b/src/Vlc.DotNet.Core.Interops/VlcMediaPlayerInstance.cs
@@ -12,7 +12,7 @@ internal VlcMediaPlayerInstance(VlcManager manager, IntPtr pointer) : base(point
             myManager = manager;
         }
 
-        public override void Dispose(bool disposing)
+        protected override void Dispose(bool disposing)
         {
             if (Pointer != IntPtr.Zero)
                 myManager.ReleaseMediaPlayer(this);