static PyObject *
vlcObject_release( PyObject *self, PyObject *p_args )
{
- if( VLCSELF->b_released == 0 )
+ if( (vlcObject*)self->b_released == 0 )
{
- vlc_object_release( VLCSELF->p_object );
- VLCSELF->b_released = 1;
+ vlc_object_release( VLCOBJ(self) );
+ (vlcObject*)self->b_released = 1;
}
Py_INCREF( Py_None );
return Py_None;
return Py_None;
}
- p_obj = vlc_object_find( VLCSELF->p_object, i_object_type, FIND_ANYWHERE );
+ p_obj = vlc_object_find( VLCOBJ(self), i_object_type, FIND_ANYWHERE );
if( !p_obj )
{
if( !PyArg_ParseTuple( args, "s", &psz_name ) )
return NULL;
- p_obj = vlc_object_find_name( VLCSELF->p_object, psz_name, FIND_ANYWHERE );
+ p_obj = vlc_object_find_name( VLCOBJ(self), psz_name, FIND_ANYWHERE );
if( !p_obj )
{
vlc_object_t *p_obj;
vlc_object_internals_t *p_priv;
- p_obj = VLCSELF->p_object;
+ p_obj = VLCOBJ(self);
p_priv = vlc_internals( p_obj );
/* Return information about the object as a dict. */
if( !PyArg_ParseTuple( args, "s", &psz_name ) )
return NULL;
- if( var_Get( VLCSELF->p_object, psz_name, &value ) != VLC_SUCCESS )
+ if( var_Get( VLCOBJ(self), psz_name, &value ) != VLC_SUCCESS )
{
PyErr_SetString( PyExc_StandardError,
"Error: variable does not exist.\n" );
return NULL;
}
- i_type = var_Type ( VLCSELF->p_object, psz_name );
+ i_type = var_Type ( VLCOBJ(self), psz_name );
switch ( i_type )
{
if( !PyArg_ParseTuple( args, "s", &psz_name ) )
return NULL;
- i_type = var_Type( VLCSELF->p_object, psz_name );
+ i_type = var_Type( VLCOBJ(self), psz_name );
switch ( i_type )
{
if( !PyArg_ParseTuple( args, "sO", &psz_name, &py_value ) )
return NULL;
- p_obj = VLCSELF->p_object;
+ p_obj = VLCOBJ(self);
i_type = var_Type( p_obj, psz_name );
switch ( i_type )
Py_ssize_t i_index;
vlc_object_internals_t *p_priv;
- p_priv = vlc_internals( VLCSELF->p_object );
+ p_priv = vlc_internals( VLCOBJ(self) );
i_size = p_priv->i_vars;
p_retval = PyTuple_New( i_size );
if( !PyArg_ParseTuple( args, "s", &psz_name ) )
return NULL;
- p_config = config_FindConfig( VLCSELF->p_object, psz_name );
+ p_config = config_FindConfig( VLCOBJ(self), psz_name );
if( !p_config )
{
if( !PyArg_ParseTuple( args, "sO", &psz_name, &py_value ) )
return NULL;
- p_obj = VLCSELF->p_object;
+ p_obj = VLCOBJ(self);
p_config = config_FindConfig( p_obj, psz_name );
/* sanity checks */
if( !p_config )
Py_ssize_t i_size;
Py_ssize_t i_index;
- i_size = VLCSELF->p_object->i_children;
+ i_size = VLCOBJ(self)->i_children;
p_retval = PyTuple_New( i_size );
for ( i_index = 0 ; i_index < i_size ; i_index++ )
{
- PyTuple_SetItem( p_retval, i_index,
- Py_BuildValue( "i",
- VLCSELF->p_object->pp_children[i_index]->i_object_id ) );
+ PyTuple_SetItem( p_retval, i_index, Py_BuildValue( "i",
+ VLCOBJ(self)->pp_children[i_index]->i_object_id ) );
}
return p_retval;
{
self->mc = mediacontrol_new( i_size, ppsz_args, exception );
self->vlc_instance = PyObject_New( vlcInstance, &vlcInstance_Type );
- self->vlc_instance->p_instance = mediacontrol_get_libvlc_instance( SELF->mc );
+ self->vlc_instance->p_instance = mediacontrol_get_libvlc_instance( LIBVLC_MC(self) );
}
MC_EXCEPT;
Py_END_ALLOW_THREADS
MediaControl_dealloc( PyObject *self )
{
fprintf(stderr, "MC dealloc\n");
- Py_DECREF( SELF->vlc_instance );
+ Py_DECREF( ((MediaControl*)self)->vlc_instance );
PyObject_DEL( self );
}
{
vlcInstance *p_ret;
- p_ret = SELF->vlc_instance;
+ p_ret = ((MediaControl*)self)->vlc_instance;
Py_INCREF( p_ret );
return ( PyObject * )p_ret;
}
vlcMediaPlayer *p_ret;
p_ret = PyObject_New( vlcMediaPlayer, &vlcMediaPlayer_Type );
- p_ret->p_mp = mediacontrol_get_media_player( SELF->mc );
+ p_ret->p_mp = mediacontrol_get_media_player( LIBVLC_MC(self) );
Py_INCREF( p_ret );
return ( PyObject * )p_ret;
}
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- pos = mediacontrol_get_media_position( SELF->mc, origin, key, exception );
+ pos = mediacontrol_get_media_position( LIBVLC_MC(self), origin, key, exception );
Py_END_ALLOW_THREADS
MC_EXCEPT;
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- mediacontrol_set_media_position( SELF->mc, a_position, exception );
+ mediacontrol_set_media_position( LIBVLC_MC(self), a_position, exception );
free( a_position );
Py_END_ALLOW_THREADS
MC_EXCEPT;
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- mediacontrol_start( SELF->mc, a_position, exception );
+ mediacontrol_start( LIBVLC_MC(self), a_position, exception );
free( a_position );
Py_END_ALLOW_THREADS
MC_EXCEPT;
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- mediacontrol_pause( SELF->mc, exception );
+ mediacontrol_pause( LIBVLC_MC(self), exception );
Py_END_ALLOW_THREADS
MC_EXCEPT;
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- mediacontrol_resume( SELF->mc, exception );
+ mediacontrol_resume( LIBVLC_MC(self), exception );
Py_END_ALLOW_THREADS
MC_EXCEPT;
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- mediacontrol_stop( SELF->mc, exception );
+ mediacontrol_stop( LIBVLC_MC(self), exception );
Py_END_ALLOW_THREADS
MC_EXCEPT;
static PyObject *
MediaControl_exit( PyObject *self, PyObject *args )
{
- mediacontrol_exit( SELF->mc );
+ mediacontrol_exit( LIBVLC_MC(self) );
Py_INCREF( Py_None );
return Py_None;
}
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- mediacontrol_set_mrl( SELF->mc, psz_file, exception );
+ mediacontrol_set_mrl( LIBVLC_MC(self), psz_file, exception );
Py_END_ALLOW_THREADS
MC_EXCEPT;
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- psz_file = mediacontrol_get_mrl( SELF->mc, exception );
+ psz_file = mediacontrol_get_mrl( LIBVLC_MC(self), exception );
Py_END_ALLOW_THREADS
MC_EXCEPT;
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- p_retval = mediacontrol_snapshot( SELF->mc, a_position, exception );
+ p_retval = mediacontrol_snapshot( LIBVLC_MC(self), a_position, exception );
free( a_position );
Py_END_ALLOW_THREADS
MC_EXCEPT;
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- mediacontrol_display_text( SELF->mc, message, begin, end, exception );
+ mediacontrol_display_text( LIBVLC_MC(self), message, begin, end, exception );
Py_END_ALLOW_THREADS
MC_EXCEPT;
Py_BEGIN_ALLOW_THREADS
MC_TRY;
retval = mediacontrol_get_stream_information(
- SELF->mc, mediacontrol_MediaTime, exception );
+ LIBVLC_MC(self), mediacontrol_MediaTime, exception );
Py_END_ALLOW_THREADS
MC_EXCEPT;
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- mediacontrol_sound_set_volume( SELF->mc, volume, exception );
+ mediacontrol_sound_set_volume( LIBVLC_MC(self), volume, exception );
Py_END_ALLOW_THREADS
MC_EXCEPT;
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- volume = mediacontrol_sound_get_volume( SELF->mc, exception );
+ volume = mediacontrol_sound_get_volume( LIBVLC_MC(self), exception );
Py_END_ALLOW_THREADS
MC_EXCEPT;
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- mediacontrol_set_rate( SELF->mc, rate, exception );
+ mediacontrol_set_rate( LIBVLC_MC(self), rate, exception );
Py_END_ALLOW_THREADS
MC_EXCEPT;
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- rate = mediacontrol_get_rate( SELF->mc, exception );
+ rate = mediacontrol_get_rate( LIBVLC_MC(self), exception );
Py_END_ALLOW_THREADS
MC_EXCEPT;
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- mediacontrol_set_fullscreen( SELF->mc, fs, exception );
+ mediacontrol_set_fullscreen( LIBVLC_MC(self), fs, exception );
Py_END_ALLOW_THREADS
MC_EXCEPT;
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- fs = mediacontrol_get_fullscreen( SELF->mc, exception );
+ fs = mediacontrol_get_fullscreen( LIBVLC_MC(self), exception );
Py_END_ALLOW_THREADS
MC_EXCEPT;
Py_BEGIN_ALLOW_THREADS
MC_TRY;
- mediacontrol_set_visual( SELF->mc, visual, exception );
+ mediacontrol_set_visual( LIBVLC_MC(self), visual, exception );
Py_END_ALLOW_THREADS
MC_EXCEPT;