Don't clutter REGISTRY on windows...

[vlc] / bindings / python / vlc_module.c

diff --git a/bindings/python/vlc_module.c b/bindings/python/vlc_module.c
index ffccabf432024ed450fa46319c5eb85249951c21..418e297e4ab1432319673321ce43b7ec50360458 100644 (file)
--- a/bindings/python/vlc_module.c
+++ b/bindings/python/vlc_module.c
@@ -47,11 +47,13 @@ initvlc( void )
 {
     PyObject* p_module;
 
-    PyPosition_Type.tp_new = PyType_GenericNew;
-    PyPosition_Type.tp_alloc = PyType_GenericAlloc;
+    /* vlcMediaPlayer_Type.tp_new = PyType_GenericNew; */
+    vlcMediaPlayer_Type.tp_alloc = PyType_GenericAlloc;
+    /* vlcMedia_Type.tp_new = PyType_GenericNew; */
+    vlcMedia_Type.tp_alloc = PyType_GenericAlloc;
 
-    vlcInput_Type.tp_new = PyType_GenericNew;
-    vlcInput_Type.tp_alloc = PyType_GenericAlloc;
+    vlcInstance_Type.tp_alloc = PyType_GenericAlloc;
+    MediaControl_Type.tp_alloc = PyType_GenericAlloc;
 
     p_module = Py_InitModule3( "vlc", vlc_methods,
                                "VLC media player embedding module." );
@@ -65,7 +67,9 @@ initvlc( void )
         return;
     if( PyType_Ready( &vlcInstance_Type ) < 0 )
         return;
-    if( PyType_Ready( &vlcInput_Type ) < 0 )
+    if( PyType_Ready( &vlcMediaPlayer_Type ) < 0 )
+        return;
+    if( PyType_Ready( &vlcMedia_Type ) < 0 )
         return;
 
     /* Exceptions */
@@ -100,11 +104,11 @@ initvlc( void )
                         MediaControl_PlaylistException );
 
     /* Exceptions */
-    vlcInstance_Exception =
+    vlc_Exception =
         PyErr_NewException( "vlc.InstanceException", NULL, NULL );
-    Py_INCREF( vlcInstance_Exception );
+    Py_INCREF( vlc_Exception );
     PyModule_AddObject( p_module, "InstanceException",
-                        vlcInstance_Exception );
+                        vlc_Exception );
 
     /* Types */
     Py_INCREF( &PyPosition_Type );
@@ -118,9 +122,14 @@ initvlc( void )
     Py_INCREF( &vlcInstance_Type );
     PyModule_AddObject( p_module, "Instance",
                         ( PyObject * )&vlcInstance_Type );
-    Py_INCREF( &vlcInput_Type );
-    PyModule_AddObject( p_module, "Input",
-                        ( PyObject * )&vlcInput_Type );
+
+    Py_INCREF( &vlcMediaPlayer_Type );
+    PyModule_AddObject( p_module, "MediaPlayer",
+                        ( PyObject * )&vlcMediaPlayer_Type );
+
+    Py_INCREF( &vlcMedia_Type );
+    PyModule_AddObject( p_module, "Media",
+                        ( PyObject * )&vlcMedia_Type );
 
     /* Constants */
     PyModule_AddIntConstant( p_module, "AbsolutePosition",
@@ -136,6 +145,7 @@ initvlc( void )
                              mediacontrol_SampleCount );
     PyModule_AddIntConstant( p_module, "MediaTime",
                              mediacontrol_MediaTime );
+
     PyModule_AddIntConstant( p_module, "PlayingStatus",
                              mediacontrol_PlayingStatus );
     PyModule_AddIntConstant( p_module, "PauseStatus",
@@ -150,23 +160,18 @@ initvlc( void )
                              mediacontrol_EndStatus );
     PyModule_AddIntConstant( p_module, "UndefinedStatus",
                              mediacontrol_UndefinedStatus );
-}
-
 
-/* Make libpostproc happy... */
-void * fast_memcpy( void * to, const void * from, size_t len )
-{
-  return memcpy( to, from, len );
 }
 
 /* Horrible hack... Please do not look.  Temporary workaround for the
    forward declaration mess of python types (cf vlcglue.h). If we do a
    separate compilation, we have to declare some types as extern. But
-   the recommended way to forward declare types in python is
+   the recommended way to forward declared types in python is
    static... I am sorting the mess but in the meantime, this will
    produce a working python module.
 */
 #include "vlc_mediacontrol.c"
 #include "vlc_position.c"
 #include "vlc_instance.c"
-#include "vlc_input.c"
+#include "vlc_mediaplayer.c"
+#include "vlc_media.c"