Qt4 - Ambiguous shortcut overload: Ctrl+ P

[vlc] / bindings / python / vlc_module.c

diff --git a/bindings/python/vlc_module.c b/bindings/python/vlc_module.c
index 94fba63455928e93bd9a557e57b4182fd0407403..ffccabf432024ed450fa46319c5eb85249951c21 100644 (file)
--- a/bindings/python/vlc_module.c
+++ b/bindings/python/vlc_module.c
@@ -2,7 +2,7 @@
  * vlc_module.c: vlc python binding module
  *****************************************************************************
  * Copyright (C) 2006 the VideoLAN team
- * $Id: $
+ * $Id$
  *
  * Authors: Olivier Aubert <oaubert at bat710.univ-lyon1.fr>
  *
@@ -21,11 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-/* We need to access some internal features of VLC (for vlc_object) */
-/* This is gruik as we are not libvlc at all */
-#define __LIBVLC__
-
-
 #include "vlcglue.h"
 
 /**************************************************************************
@@ -68,8 +63,6 @@ initvlc( void )
         return;
     if( PyType_Ready( &MediaControl_Type ) < 0 )
         return;
-    if( PyType_Ready( &vlcObject_Type ) < 0 )
-        return;
     if( PyType_Ready( &vlcInstance_Type ) < 0 )
         return;
     if( PyType_Ready( &vlcInput_Type ) < 0 )
@@ -122,9 +115,6 @@ initvlc( void )
     PyModule_AddObject( p_module, "MediaControl",
                         ( PyObject * )&MediaControl_Type );
 
-    Py_INCREF( &vlcObject_Type );
-    PyModule_AddObject( p_module, "Object",
-                        ( PyObject * )&vlcObject_Type );
     Py_INCREF( &vlcInstance_Type );
     PyModule_AddObject( p_module, "Instance",
                         ( PyObject * )&vlcInstance_Type );
@@ -180,4 +170,3 @@ void * fast_memcpy( void * to, const void * from, size_t len )
 #include "vlc_position.c"
 #include "vlc_instance.c"
 #include "vlc_input.c"
-#include "vlc_object.c"