Commit 9df6f209 authored by Rafaël Carré's avatar Rafaël Carré

libvlc_destroy() -> libvlc_release()

parent e6a14c1d
...@@ -661,7 +661,7 @@ HRESULT VLCPlugin::onClose(DWORD dwSaveOption) ...@@ -661,7 +661,7 @@ HRESULT VLCPlugin::onClose(DWORD dwSaveOption)
_p_libvlc = NULL; _p_libvlc = NULL;
vlcDataObject->onClose(); vlcDataObject->onClose();
libvlc_destroy(p_libvlc, NULL ); libvlc_release(p_libvlc, NULL );
} }
return S_OK; return S_OK;
}; };
......
...@@ -55,7 +55,7 @@ namespace VideoLAN.LibVLC ...@@ -55,7 +55,7 @@ namespace VideoLAN.LibVLC
public static extern public static extern
InstanceHandle Create (int argc, U8String[] argv, NativeException ex); 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); static extern void Destroy (IntPtr ptr, NativeException ex);
protected override bool ReleaseHandle () protected override bool ReleaseHandle ()
......
...@@ -81,7 +81,7 @@ JNIEXPORT void JNICALL Java_org_videolan_jvlc_JVLC__1destroy (JNIEnv *env, jobje ...@@ -81,7 +81,7 @@ JNIEXPORT void JNICALL Java_org_videolan_jvlc_JVLC__1destroy (JNIEnv *env, jobje
instance = getClassInstance( env, _this ); instance = getClassInstance( env, _this );
libvlc_destroy( (libvlc_instance_t *) instance, NULL); libvlc_release( (libvlc_instance_t *) instance, NULL);
return; return;
} }
......
...@@ -112,7 +112,7 @@ static void ...@@ -112,7 +112,7 @@ static void
vlcInstance_dealloc( PyObject *self ) vlcInstance_dealloc( PyObject *self )
{ {
libvlc_exception_t ex; libvlc_exception_t ex;
libvlc_destroy( LIBVLC_INSTANCE->p_instance, &ex ); libvlc_release( LIBVLC_INSTANCE->p_instance, &ex );
PyObject_DEL( self ); PyObject_DEL( self );
} }
......
...@@ -108,7 +108,7 @@ static void * DestroySharedLibraryAtExit( void ) ...@@ -108,7 +108,7 @@ static void * DestroySharedLibraryAtExit( void )
libvlc_exception_t ex; libvlc_exception_t ex;
libvlc_exception_init( &ex ); libvlc_exception_init( &ex );
libvlc_destroy( instance, &ex ); libvlc_release( instance, &ex );
} }
instance = nil; instance = nil;
[audio release]; [audio release];
......
...@@ -42,7 +42,7 @@ PyObject *create_destroy( PyObject *self, PyObject *args ) ...@@ -42,7 +42,7 @@ PyObject *create_destroy( PyObject *self, PyObject *args )
ASSERT( p_i1 != NULL, "Instance creation failed" ); ASSERT( p_i1 != NULL, "Instance creation failed" );
ASSERT_NOEXCEPTION; ASSERT_NOEXCEPTION;
id1 = libvlc_get_vlc_id( p_i1 ); id1 = libvlc_get_vlc_id( p_i1 );
libvlc_destroy( p_i1, &exception ); libvlc_release( p_i1, &exception );
ASSERT_NOEXCEPTION; ASSERT_NOEXCEPTION;
/* Create and destroy two instances */ /* Create and destroy two instances */
...@@ -57,10 +57,10 @@ PyObject *create_destroy( PyObject *self, PyObject *args ) ...@@ -57,10 +57,10 @@ PyObject *create_destroy( PyObject *self, PyObject *args )
ASSERT_NOEXCEPTION; ASSERT_NOEXCEPTION;
fprintf( stderr, "Destroy 1\n" ); fprintf( stderr, "Destroy 1\n" );
libvlc_destroy( p_i1, &exception ); libvlc_release( p_i1, &exception );
ASSERT_NOEXCEPTION; ASSERT_NOEXCEPTION;
fprintf( stderr, "Destroy 2\n" ); fprintf( stderr, "Destroy 2\n" );
libvlc_destroy( p_i2, &exception ); libvlc_release( p_i2, &exception );
ASSERT_NOEXCEPTION; ASSERT_NOEXCEPTION;
/* Deinit */ /* Deinit */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment