Revert broken loading of libvlc with OPTION_DLOPEN_GLOBAL in jvlc

[vlc] / bindings / python / vlcglue.h

diff --git a/bindings/python/vlcglue.h b/bindings/python/vlcglue.h
index d6e4c4416588e3dd2cba6f5d65c2572ced1f8115..d5f604c4ec2223f2018ca16c24c7b6fd13e72165 100644 (file)
--- a/bindings/python/vlcglue.h
+++ b/bindings/python/vlcglue.h
@@ -4,7 +4,7 @@
  * Copyright (C) 1998-2004 the VideoLAN team
  * $Id$
  *
- * Authors: Olivier Aubert <oaubert at bat710.univ-lyon1.fr>
+ * Authors: Olivier Aubert <olivier.aubert at liris.cnrs.fr>
  *          Clément Stenac <zorglub@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,6 @@ typedef int Py_ssize_t;
 #define PY_SSIZE_T_MIN INT_MIN
 #endif
 
-#define SELF ((MediaControl*)self)
 
 /**********************************************************************
  * Exceptions handling
@@ -89,8 +88,6 @@ typedef struct
     libvlc_instance_t* p_instance;
 } vlcInstance;
 
-#define LIBVLC_INSTANCE ((vlcInstance*)self)
-
 /**********************************************************************
  * MediaControl Object
  **********************************************************************/
@@ -137,9 +134,10 @@ 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_MC(self) (((MediaControl*)self)->mc)
 
 #define LIBVLC_TRY libvlc_exception_init( &ex );