/*****************************************************************************
* vlc_module.c: vlc python binding module
*****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006,2007,2008,2009 the VideoLAN team
* $Id$
*
- * Authors: Olivier Aubert <oaubert at bat710.univ-lyon1.fr>
+ * Authors: Olivier Aubert <olivier.aubert at liris.cnrs.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
{
PyObject* p_module;
- vlcMediaInstance_Type.tp_new = PyType_GenericNew;
- vlcMediaInstance_Type.tp_alloc = PyType_GenericAlloc;
- vlcMediaDescriptor_Type.tp_new = PyType_GenericNew;
- vlcMediaDescriptor_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;
+
+ vlcInstance_Type.tp_alloc = PyType_GenericAlloc;
+ MediaControl_Type.tp_alloc = PyType_GenericAlloc;
p_module = Py_InitModule3( "vlc", vlc_methods,
"VLC media player embedding module." );
return;
if( PyType_Ready( &vlcInstance_Type ) < 0 )
return;
- if( PyType_Ready( &vlcMediaInstance_Type ) < 0 )
+ if( PyType_Ready( &vlcMediaPlayer_Type ) < 0 )
return;
- if( PyType_Ready( &vlcMediaDescriptor_Type ) < 0 )
+ if( PyType_Ready( &vlcMedia_Type ) < 0 )
return;
/* Exceptions */
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 );
Py_INCREF( &vlcInstance_Type );
PyModule_AddObject( p_module, "Instance",
( PyObject * )&vlcInstance_Type );
- Py_INCREF( &vlcMediaInstance_Type );
- PyModule_AddObject( p_module, "MediaInstance",
- ( PyObject * )&vlcMediaInstance_Type );
- Py_INCREF( &vlcMediaDescriptor_Type );
- PyModule_AddObject( p_module, "MediaDescriptor",
- ( PyObject * )&vlcMediaDescriptor_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",
mediacontrol_PlayingStatus );
PyModule_AddIntConstant( p_module, "PauseStatus",
mediacontrol_PauseStatus );
- PyModule_AddIntConstant( p_module, "ForwardStatus",
- mediacontrol_ForwardStatus );
- PyModule_AddIntConstant( p_module, "BackwardStatus",
- mediacontrol_BackwardStatus );
PyModule_AddIntConstant( p_module, "InitStatus",
mediacontrol_InitStatus );
PyModule_AddIntConstant( p_module, "EndStatus",
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
#include "vlc_mediacontrol.c"
#include "vlc_position.c"
#include "vlc_instance.c"
-#include "vlc_input.c"
-#include "vlc_mediadescriptor.c"
+#include "vlc_mediaplayer.c"
+#include "vlc_media.c"