python: use new function libvlc_errmsg (reported by Xitij Patel <xitij.patel@xitijpat...

[vlc] / bindings / python / vlcglue.h

diff --git a/bindings/python/vlcglue.h b/bindings/python/vlcglue.h
index d6e4c4416588e3dd2cba6f5d65c2572ced1f8115..521164572935a1a59df17ae3881c100be3b118c0 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,15 +134,16 @@ 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 );
 
 #define LIBVLC_EXCEPT if( libvlc_exception_raised( &ex ) ) { \
     PyObject *py_exc = vlc_Exception; \
-    PyErr_SetString( py_exc, libvlc_exception_get_message( &ex ) ); \
+    PyErr_SetString( py_exc, libvlc_errmsg() );        \
     return NULL; \
   }