X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bindings%2Fpython%2Fvlcglue.h;h=d6e4c4416588e3dd2cba6f5d65c2572ced1f8115;hb=5ad6561ceab66b046b648e7651ed63c071d6012d;hp=54f2ca2dfb10e391323718d4c999c60d3104cf1d;hpb=bf1292e44390c6469483cea3817d6c2a3dbd811c;p=vlc

diff --git a/bindings/python/vlcglue.h b/bindings/python/vlcglue.h
index 54f2ca2dfb..d6e4c44165 100644
--- a/bindings/python/vlcglue.h
+++ b/bindings/python/vlcglue.h
@@ -78,7 +78,7 @@ PyObject *MediaControl_PositionKeyNotSupported;
 PyObject *MediaControl_PositionOriginNotSupported;
 PyObject *MediaControl_InvalidPosition;
 PyObject *MediaControl_PlaylistException;
-PyObject *vlcInstance_Exception;
+PyObject *vlc_Exception;
 
 /**********************************************************************
  * vlc.Instance Object
@@ -113,38 +113,38 @@ typedef struct
 } PyPosition;
 
 /**********************************************************************
- * vlc.MediaInstance Object
+ * vlc.MediaPlayer Object
  **********************************************************************/
 typedef struct
 {
     PyObject_HEAD
-    libvlc_media_player_t* p_mi;
-} vlcMediaInstance;
+    libvlc_media_player_t* p_mp;
+} vlcMediaPlayer;
 
 /**********************************************************************
- * vlc.MediaDescriptor Object
+ * vlc.Media Object
  **********************************************************************/
 typedef struct
 {
     PyObject_HEAD
-    libvlc_media_t* p_md;
-} vlcMediaDescriptor;
+    libvlc_media_t* p_media;
+} vlcMedia;
 
 /* Forward declarations */
 staticforward PyTypeObject MediaControl_Type;
 staticforward PyTypeObject PyPosition_Type;
 staticforward PyTypeObject vlcInstance_Type;
-staticforward PyTypeObject vlcMediaInstance_Type;
-staticforward PyTypeObject vlcMediaDescriptor_Type;
+staticforward PyTypeObject vlcMediaPlayer_Type;
+staticforward PyTypeObject vlcMedia_Type;
 
 #define LIBVLC_INSTANCE ((vlcInstance*)self)
-#define LIBVLC_MEDIAINSTANCE ((vlcMediaInstance*)self)
-#define LIBVLC_MEDIADESCRIPTOR ((vlcMediaDescriptor*)self)
+#define LIBVLC_MEDIAPLAYER ((vlcMediaPlayer*)self)
+#define LIBVLC_MEDIA ((vlcMedia*)self)
 
 #define LIBVLC_TRY libvlc_exception_init( &ex );
 
 #define LIBVLC_EXCEPT if( libvlc_exception_raised( &ex ) ) { \
-    PyObject *py_exc = vlcInstance_Exception; \
+    PyObject *py_exc = vlc_Exception; \
     PyErr_SetString( py_exc, libvlc_exception_get_message( &ex ) ); \
     return NULL; \
   }