Commit ac12ee39 authored by Olivier Aubert's avatar Olivier Aubert
Browse files

python bindings, vlcglue.h: move definition of vlcInstance, add a

vlc_instance pointer to MediaControl object
by Jan David Mol)
parent 12e055f6
...@@ -80,6 +80,17 @@ PyObject *MediaControl_InvalidPosition; ...@@ -80,6 +80,17 @@ PyObject *MediaControl_InvalidPosition;
PyObject *MediaControl_PlaylistException; PyObject *MediaControl_PlaylistException;
PyObject *vlcInstance_Exception; PyObject *vlcInstance_Exception;
/**********************************************************************
* vlc.Instance Object
**********************************************************************/
typedef struct
{
PyObject_HEAD
libvlc_instance_t* p_instance;
} vlcInstance;
#define LIBVLC_INSTANCE ((vlcInstance*)self)
/********************************************************************** /**********************************************************************
* MediaControl Object * MediaControl Object
**********************************************************************/ **********************************************************************/
...@@ -87,6 +98,7 @@ typedef struct ...@@ -87,6 +98,7 @@ typedef struct
{ {
PyObject_HEAD PyObject_HEAD
mediacontrol_Instance* mc; mediacontrol_Instance* mc;
vlcInstance *vlc_instance;
} MediaControl; } MediaControl;
/********************************************************************** /**********************************************************************
...@@ -100,17 +112,6 @@ typedef struct ...@@ -100,17 +112,6 @@ typedef struct
PY_LONG_LONG value; PY_LONG_LONG value;
} PyPosition; } PyPosition;
/**********************************************************************
* vlc.Instance Object
**********************************************************************/
typedef struct
{
PyObject_HEAD
libvlc_instance_t* p_instance;
} vlcInstance;
#define LIBVLC_INSTANCE ((vlcInstance*)self)
/********************************************************************** /**********************************************************************
* vlc.Input Object * vlc.Input Object
**********************************************************************/ **********************************************************************/
......
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