Parametrize macros, and pack up deref that happens anyway.

[vlc] / bindings / python / vlcglue.h

diff --git a/bindings/python/vlcglue.h b/bindings/python/vlcglue.h
index d6e4c4416588e3dd2cba6f5d65c2572ced1f8115..65da35ea47734747f6878b7423a7cea98505f11d 100644 (file)
--- a/bindings/python/vlcglue.h
+++ b/bindings/python/vlcglue.h
@@ -89,8 +89,6 @@ typedef struct
     libvlc_instance_t* p_instance;
 } vlcInstance;
 
-#define LIBVLC_INSTANCE ((vlcInstance*)self)
-
 /**********************************************************************
  * MediaControl Object
  **********************************************************************/
@@ -137,9 +135,9 @@ staticforward PyTypeObject vlcInstance_Type;
 staticforward PyTypeObject vlcMediaPlayer_Type;
 staticforward PyTypeObject vlcMedia_Type;
 
-#define LIBVLC_INSTANCE ((vlcInstance*)self)
-#define LIBVLC_MEDIAPLAYER ((vlcMediaPlayer*)self)
-#define LIBVLC_MEDIA ((vlcMedia*)self)
+#define LIBVLC_INSTANCE(self) (((vlcInstance*)self)->p_instance)
+#define LIBVLC_MEDIAPLAYER(self) (((vlcMediaPlayer*)self)->p_mp)
+#define LIBVLC_MEDIA(self) (((vlcMedia*)self)->p_media)
 
 #define LIBVLC_TRY libvlc_exception_init( &ex );