Commit 88fc2c28 authored by Rafaël Carré's avatar Rafaël Carré

libvlc_release(): removes unused exception

parent b941c1e4
...@@ -667,7 +667,7 @@ HRESULT VLCPlugin::onClose(DWORD dwSaveOption) ...@@ -667,7 +667,7 @@ HRESULT VLCPlugin::onClose(DWORD dwSaveOption)
_p_libvlc = NULL; _p_libvlc = NULL;
vlcDataObject->onClose(); vlcDataObject->onClose();
libvlc_release(p_libvlc, NULL ); libvlc_release(p_libvlc);
} }
return S_OK; return S_OK;
}; };
......
...@@ -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_release( (libvlc_instance_t *) instance, NULL); libvlc_release( (libvlc_instance_t *) instance );
return; return;
} }
......
...@@ -111,8 +111,7 @@ vlcInstance_new( PyTypeObject *type, PyObject *args, PyObject *kwds ) ...@@ -111,8 +111,7 @@ vlcInstance_new( PyTypeObject *type, PyObject *args, PyObject *kwds )
static void static void
vlcInstance_dealloc( PyObject *self ) vlcInstance_dealloc( PyObject *self )
{ {
libvlc_exception_t ex; libvlc_release( LIBVLC_INSTANCE->p_instance );
libvlc_release( LIBVLC_INSTANCE->p_instance, &ex );
PyObject_DEL( self ); PyObject_DEL( self );
} }
......
...@@ -123,7 +123,7 @@ VLC_PUBLIC_API int libvlc_get_vlc_id( libvlc_instance_t *p_instance ); ...@@ -123,7 +123,7 @@ VLC_PUBLIC_API int libvlc_get_vlc_id( libvlc_instance_t *p_instance );
* if it reaches zero. * if it reaches zero.
* \param p_instance the instance to destroy * \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. * Increments the reference count of a libvlc instance.
......
...@@ -269,7 +269,7 @@ VlcPlugin::~VlcPlugin() ...@@ -269,7 +269,7 @@ VlcPlugin::~VlcPlugin()
if( libvlc_log ) if( libvlc_log )
libvlc_log_close(libvlc_log, NULL); libvlc_log_close(libvlc_log, NULL);
if( libvlc_instance ) if( libvlc_instance )
libvlc_release(libvlc_instance, NULL ); libvlc_release(libvlc_instance);
} }
/***************************************************************************** /*****************************************************************************
......
...@@ -146,7 +146,7 @@ void libvlc_retain( libvlc_instance_t *p_instance ) ...@@ -146,7 +146,7 @@ void libvlc_retain( libvlc_instance_t *p_instance )
vlc_mutex_unlock( &p_instance->instance_lock ); 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; vlc_mutex_t *lock = &p_instance->instance_lock;
int refs; int refs;
......
...@@ -103,7 +103,7 @@ void libvlc_event_manager_release( libvlc_event_manager_t * p_em ) ...@@ -103,7 +103,7 @@ void libvlc_event_manager_release( libvlc_event_manager_t * p_em )
FOREACH_END() FOREACH_END()
ARRAY_RESET( p_em->listeners_groups ); ARRAY_RESET( p_em->listeners_groups );
libvlc_release( p_em->p_libvlc_instance, NULL ); libvlc_release( p_em->p_libvlc_instance );
free( p_em ); free( p_em );
} }
......
...@@ -76,10 +76,7 @@ mediacontrol_Instance* mediacontrol_new( int argc, char** argv, mediacontrol_Exc ...@@ -76,10 +76,7 @@ mediacontrol_Instance* mediacontrol_new( int argc, char** argv, mediacontrol_Exc
void void
mediacontrol_exit( mediacontrol_Instance *self ) mediacontrol_exit( mediacontrol_Instance *self )
{ {
libvlc_exception_t ex; libvlc_release( self->p_instance );
libvlc_exception_init( &ex );
libvlc_release( self->p_instance, &ex );
} }
libvlc_instance_t* libvlc_instance_t*
......
...@@ -76,7 +76,7 @@ void libvlc_tag_query_release( libvlc_tag_query_t * p_q ) ...@@ -76,7 +76,7 @@ void libvlc_tag_query_release( libvlc_tag_query_t * p_q )
free( p_q->tag ); free( p_q->tag );
free( p_q->psz_tag_key ); free( p_q->psz_tag_key );
libvlc_release( p_q->p_libvlc_instance, NULL ); libvlc_release( p_q->p_libvlc_instance );
free( p_q ); free( p_q );
} }
......
...@@ -71,10 +71,8 @@ static void test_core (const char ** argv, int argc) ...@@ -71,10 +71,8 @@ static void test_core (const char ** argv, int argc)
catch (); catch ();
libvlc_retain (vlc); libvlc_retain (vlc);
libvlc_release (vlc, &ex); libvlc_release (vlc);
catch (); libvlc_release (vlc);
libvlc_release (vlc, &ex);
catch ();
} }
static void test_media_list (const char ** argv, int argc) static void test_media_list (const char ** argv, int argc)
......
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