char** ppsz_args = NULL;
int i_size = 0;
- self = PyObject_New( vlcInstance, &vlcInstance_Type );
-
-
if( PyArg_ParseTuple( args, "O", &py_list ) )
{
i_size = pyoptions_to_args( py_list, &ppsz_args );
PyErr_Clear( );
}
+ self = PyObject_New( vlcInstance, &vlcInstance_Type );
+
Py_BEGIN_ALLOW_THREADS
LIBVLC_TRY
LIBVLC_INSTANCE->p_instance = libvlc_new( i_size, ppsz_args, &ex );
{
libvlc_exception_t ex;
libvlc_destroy( LIBVLC_INSTANCE->p_instance, &ex );
- PyMem_DEL( self );
+ PyObject_DEL( self );
}
static PyObject *
vlcInstance_playlist_get_input( PyObject *self, PyObject *args )
{
libvlc_exception_t ex;
- libvlc_input_t *p_input;
+ libvlc_media_instance_t *p_md;
vlcInput *p_ret;
LIBVLC_TRY;
- p_input = libvlc_playlist_get_input( LIBVLC_INSTANCE->p_instance, &ex );
+ p_md = libvlc_playlist_get_media_instance( LIBVLC_INSTANCE->p_instance, &ex );
LIBVLC_EXCEPT;
p_ret = PyObject_New( vlcInput, &vlcInput_Type );
- p_ret->p_input = p_input;
+ p_ret->p_md = p_md;
Py_INCREF( p_ret ); /* Ah bon ? */
return ( PyObject * )p_ret;
}