libvlc_release(): removes unused exception

diff --git a/activex/plugin.cpp b/activex/plugin.cpp
index ca23d48cc840122446e175da43dca74ba970ebae..e5ce069398a8391eb6370a45fbaf152276bf00a3 100644 (file)
--- a/activex/plugin.cpp
+++ b/activex/plugin.cpp
@@ -667,7 +667,7 @@ HRESULT VLCPlugin::onClose(DWORD dwSaveOption)
         _p_libvlc = NULL;
         vlcDataObject->onClose();
 
-        libvlc_release(p_libvlc, NULL );
+        libvlc_release(p_libvlc);
     }
     return S_OK;
 };

diff --git a/bindings/java/src/core-jni.cc b/bindings/java/src/core-jni.cc
index 394e30cd48fee6b9e695aeac1c7d555e77fe2245..03724642af2481cb6a80d0711abfadff22bec06d 100644 (file)
--- 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_release( (libvlc_instance_t *) instance, NULL);
+    libvlc_release( (libvlc_instance_t *) instance );
 
     return;
 }

diff --git a/bindings/python/vlc_instance.c b/bindings/python/vlc_instance.c
index c1d981f06df956e183ed2d98a65bb75629f259a9..23459be8a1ac429388a4b8f497d639e6a8290f4f 100644 (file)
--- a/bindings/python/vlc_instance.c
+++ b/bindings/python/vlc_instance.c
@@ -111,8 +111,7 @@ vlcInstance_new( PyTypeObject *type, PyObject *args, PyObject *kwds )
 static void
 vlcInstance_dealloc( PyObject *self )
 {
-    libvlc_exception_t ex;
-    libvlc_release( LIBVLC_INSTANCE->p_instance, &ex );
+    libvlc_release( LIBVLC_INSTANCE->p_instance );
     PyObject_DEL( self );
 }
 

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 8278c2da86f5cb7605894c0a77b2e8c591b40f77..4d8df140873b24a67dc468b5924bd634f87a1208 100644 (file)
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -123,7 +123,7 @@ VLC_PUBLIC_API int libvlc_get_vlc_id( libvlc_instance_t *p_instance );
  * if it reaches zero.
  * \param p_instance the instance to destroy
  */
-VLC_PUBLIC_API void libvlc_release( libvlc_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_release( libvlc_instance_t * );
 
 /**
  * Increments the reference count of a libvlc instance.

diff --git a/mozilla/vlcplugin.cpp b/mozilla/vlcplugin.cpp
index afa1399b0022740f9afb6a69ac58fabed56a60bc..4189d9f1c221ac935aacb8e87daa8149d28e0478 100644 (file)
--- a/mozilla/vlcplugin.cpp
+++ b/mozilla/vlcplugin.cpp
@@ -269,7 +269,7 @@ VlcPlugin::~VlcPlugin()
     if( libvlc_log )
         libvlc_log_close(libvlc_log, NULL);
     if( libvlc_instance )
-        libvlc_release(libvlc_instance, NULL );
+        libvlc_release(libvlc_instance);
 }
 
 /*****************************************************************************

diff --git a/src/control/core.c b/src/control/core.c
index a621c7d5ad1e25d0097284c9eb06f51ad65e5167..08f550b61229261a10840a3e60f8451f6ed90845 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -146,7 +146,7 @@ void libvlc_retain( libvlc_instance_t *p_instance )
     vlc_mutex_unlock( &p_instance->instance_lock );
 }
 
-void libvlc_release( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
+void libvlc_release( libvlc_instance_t *p_instance )
 {
     vlc_mutex_t *lock = &p_instance->instance_lock;
     int refs;

diff --git a/src/control/event.c b/src/control/event.c
index 016e3a0f7dfd66b3ac9155e55ee8a9818eea6c7f..69e0f35e83dd6a9bfcf45296d57f448b9120d0ed 100644 (file)
--- a/src/control/event.c
+++ b/src/control/event.c
@@ -103,7 +103,7 @@ void libvlc_event_manager_release( libvlc_event_manager_t * p_em )
     FOREACH_END()
     ARRAY_RESET( p_em->listeners_groups );
 
-    libvlc_release( p_em->p_libvlc_instance, NULL );
+    libvlc_release( p_em->p_libvlc_instance );
     free( p_em );
 }
 

diff --git a/src/control/mediacontrol_core.c b/src/control/mediacontrol_core.c
index c312450658c5ed0850bb7c159c396933d3083d0c..cf2bba8596b1434db6d671e9f17b73bbfb1e35c4 100644 (file)
--- a/src/control/mediacontrol_core.c
+++ b/src/control/mediacontrol_core.c
@@ -76,10 +76,7 @@ mediacontrol_Instance* mediacontrol_new( int argc, char** argv, mediacontrol_Exc
 void
 mediacontrol_exit( mediacontrol_Instance *self )
 {
-    libvlc_exception_t ex;
-    libvlc_exception_init( &ex );
-
-    libvlc_release( self->p_instance, &ex );
+    libvlc_release( self->p_instance );
 }
 
 libvlc_instance_t*

diff --git a/src/control/tag_query.c b/src/control/tag_query.c
index f534ed4d7e2ed3ef9e6efa3bcbeb68f980f59830..5b495398b0704ac73063abf0c26995bd824bbb3e 100644 (file)
--- a/src/control/tag_query.c
+++ b/src/control/tag_query.c
@@ -76,7 +76,7 @@ void libvlc_tag_query_release( libvlc_tag_query_t * p_q )
     free( p_q->tag );
     free( p_q->psz_tag_key );
  
-    libvlc_release( p_q->p_libvlc_instance, NULL );
+    libvlc_release( p_q->p_libvlc_instance );
     free( p_q );
 }
 

diff --git a/src/control/testapi.c b/src/control/testapi.c
index bb5fd1b09d1070cf669ebac2dddcefcef05c6da3..27298a42f52b1aab78bd8668ba06aa5a28d081cc 100644 (file)
--- a/src/control/testapi.c
+++ b/src/control/testapi.c
@@ -71,10 +71,8 @@ static void test_core (const char ** argv, int argc)
     catch ();
 
     libvlc_retain (vlc);
-    libvlc_release (vlc, &ex);
-    catch ();
-    libvlc_release (vlc, &ex);
-    catch ();
+    libvlc_release (vlc);
+    libvlc_release (vlc);
 }
 
 static void test_media_list (const char ** argv, int argc)