From: Rafaël Carré <funman@videolan.org>
Date: Mon, 22 Oct 2007 20:06:22 +0000 (+0000)
Subject: libvlc_destroy() -> libvlc_release()
X-Git-Tag: 0.9.0-test0~4838
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=9df6f20907913b9f2d2bfc9c0578597083d24456;p=vlc

libvlc_destroy() -> libvlc_release()
---

diff --git a/activex/plugin.cpp b/activex/plugin.cpp
index 4f7908271f..7ab1decd61 100644
--- a/activex/plugin.cpp
+++ b/activex/plugin.cpp
@@ -661,7 +661,7 @@ HRESULT VLCPlugin::onClose(DWORD dwSaveOption)
         _p_libvlc = NULL;
         vlcDataObject->onClose();
 
-        libvlc_destroy(p_libvlc, NULL );
+        libvlc_release(p_libvlc, NULL );
     }
     return S_OK;
 };
diff --git a/bindings/cil/libvlc.cs b/bindings/cil/libvlc.cs
index 032f5a06c0..86c1bb8373 100644
--- a/bindings/cil/libvlc.cs
+++ b/bindings/cil/libvlc.cs
@@ -55,7 +55,7 @@ namespace VideoLAN.LibVLC
         public static extern
         InstanceHandle Create (int argc, U8String[] argv, NativeException ex);
 
-        [DllImport ("libvlc-control.dll", EntryPoint="libvlc_destroy")]
+        [DllImport ("libvlc-control.dll", EntryPoint="libvlc_release")]
         static extern void Destroy (IntPtr ptr, NativeException ex);
 
         protected override bool ReleaseHandle ()
diff --git a/bindings/java/src/core-jni.cc b/bindings/java/src/core-jni.cc
index 91888aa7d2..394e30cd48 100644
--- a/bindings/java/src/core-jni.cc
+++ b/bindings/java/src/core-jni.cc
@@ -81,7 +81,7 @@ JNIEXPORT void JNICALL Java_org_videolan_jvlc_JVLC__1destroy (JNIEnv *env, jobje
     
     instance = getClassInstance( env, _this );
 
-    libvlc_destroy( (libvlc_instance_t *) instance, NULL);
+    libvlc_release( (libvlc_instance_t *) instance, NULL);
 
     return;
 }
diff --git a/bindings/python/vlc_instance.c b/bindings/python/vlc_instance.c
index b0e495ef9a..436d4868e0 100644
--- a/bindings/python/vlc_instance.c
+++ b/bindings/python/vlc_instance.c
@@ -112,7 +112,7 @@ static void
 vlcInstance_dealloc( PyObject *self )
 {
     libvlc_exception_t ex;
-    libvlc_destroy( LIBVLC_INSTANCE->p_instance, &ex );
+    libvlc_release( LIBVLC_INSTANCE->p_instance, &ex );
     PyObject_DEL( self );
 }
 
diff --git a/extras/MacOSX/Framework/Sources/VLCLibrary.m b/extras/MacOSX/Framework/Sources/VLCLibrary.m
index 2578b57d43..35f5931bf9 100644
--- a/extras/MacOSX/Framework/Sources/VLCLibrary.m
+++ b/extras/MacOSX/Framework/Sources/VLCLibrary.m
@@ -108,7 +108,7 @@ static void * DestroySharedLibraryAtExit( void )
         libvlc_exception_t ex;
         libvlc_exception_init( &ex );
         
-        libvlc_destroy( instance, &ex );
+        libvlc_release( instance, &ex );
     }
     instance = nil;
     [audio release];
diff --git a/test/native/libvlc.c b/test/native/libvlc.c
index b546329f9c..35564a344d 100644
--- a/test/native/libvlc.c
+++ b/test/native/libvlc.c
@@ -42,7 +42,7 @@ PyObject *create_destroy( PyObject *self, PyObject *args )
     ASSERT( p_i1 != NULL, "Instance creation failed" );
     ASSERT_NOEXCEPTION;
     id1 = libvlc_get_vlc_id( p_i1 );
-    libvlc_destroy( p_i1, &exception );
+    libvlc_release( p_i1, &exception );
     ASSERT_NOEXCEPTION;
 
     /* Create and destroy two instances */
@@ -57,10 +57,10 @@ PyObject *create_destroy( PyObject *self, PyObject *args )
     ASSERT_NOEXCEPTION;
 
     fprintf( stderr, "Destroy 1\n" );
-    libvlc_destroy( p_i1, &exception );
+    libvlc_release( p_i1, &exception );
     ASSERT_NOEXCEPTION;
     fprintf( stderr, "Destroy 2\n" );
-    libvlc_destroy( p_i2, &exception );
+    libvlc_release( p_i2, &exception );
     ASSERT_NOEXCEPTION;
 
     /* Deinit */