Commit 7b89d13c authored by Olivier Aubert's avatar Olivier Aubert

bindings/python: removed vlc.Object code from the main vlc python module. This...

bindings/python: removed vlc.Object code from the main vlc python module. This module should now be cleanly buildable from outside the VLC tree, given the public headers and appropriate libs are available.
parent a5c6ef97
...@@ -65,7 +65,7 @@ def get_ldflags(): ...@@ -65,7 +65,7 @@ def get_ldflags():
ldflags.append('-lstdc++') ldflags.append('-lstdc++')
return ldflags return ldflags
#source_files = [ 'vlc_module.c', 'vlc_object.c', 'vlc_mediacontrol.c', #source_files = [ 'vlc_module.c', 'vlc_mediacontrol.c',
# 'vlc_position.c', 'vlc_instance.c', 'vlc_input.c' ] # 'vlc_position.c', 'vlc_instance.c', 'vlc_input.c' ]
source_files = [ 'vlc_module.c' ] source_files = [ 'vlc_module.c' ]
...@@ -92,9 +92,6 @@ This module provides bindings for the native libvlc API of the VLC ...@@ -92,9 +92,6 @@ This module provides bindings for the native libvlc API of the VLC
video player. Documentation can be found on the VLC wiki : video player. Documentation can be found on the VLC wiki :
http://wiki.videolan.org/index.php/ExternalAPI http://wiki.videolan.org/index.php/ExternalAPI
The module also provides a Object type, which gives a low-level access
to the vlc objects and their variables.
This module also provides a MediaControl object, which implements an This module also provides a MediaControl object, which implements an
API inspired from the OMG Audio/Video Stream 1.0 specification. API inspired from the OMG Audio/Video Stream 1.0 specification.
Documentation can be found on the VLC wiki : Documentation can be found on the VLC wiki :
...@@ -124,13 +121,5 @@ mc.pause(0) ...@@ -124,13 +121,5 @@ mc.pause(0)
# Get status information # Get status information
mc.get_stream_information() mc.get_stream_information()
# Access lowlevel objets
o=vlc.Object(1)
o.info()
i=o.find_object('input')
i.list()
i.get('time')
""", """,
ext_modules = [ vlclocal ]) ext_modules = [ vlclocal ])
...@@ -21,11 +21,6 @@ ...@@ -21,11 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 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" #include "vlcglue.h"
/************************************************************************** /**************************************************************************
...@@ -68,8 +63,6 @@ initvlc( void ) ...@@ -68,8 +63,6 @@ initvlc( void )
return; return;
if( PyType_Ready( &MediaControl_Type ) < 0 ) if( PyType_Ready( &MediaControl_Type ) < 0 )
return; return;
if( PyType_Ready( &vlcObject_Type ) < 0 )
return;
if( PyType_Ready( &vlcInstance_Type ) < 0 ) if( PyType_Ready( &vlcInstance_Type ) < 0 )
return; return;
if( PyType_Ready( &vlcInput_Type ) < 0 ) if( PyType_Ready( &vlcInput_Type ) < 0 )
...@@ -122,9 +115,6 @@ initvlc( void ) ...@@ -122,9 +115,6 @@ initvlc( void )
PyModule_AddObject( p_module, "MediaControl", PyModule_AddObject( p_module, "MediaControl",
( PyObject * )&MediaControl_Type ); ( PyObject * )&MediaControl_Type );
Py_INCREF( &vlcObject_Type );
PyModule_AddObject( p_module, "Object",
( PyObject * )&vlcObject_Type );
Py_INCREF( &vlcInstance_Type ); Py_INCREF( &vlcInstance_Type );
PyModule_AddObject( p_module, "Instance", PyModule_AddObject( p_module, "Instance",
( PyObject * )&vlcInstance_Type ); ( PyObject * )&vlcInstance_Type );
...@@ -180,4 +170,3 @@ void * fast_memcpy( void * to, const void * from, size_t len ) ...@@ -180,4 +170,3 @@ void * fast_memcpy( void * to, const void * from, size_t len )
#include "vlc_position.c" #include "vlc_position.c"
#include "vlc_instance.c" #include "vlc_instance.c"
#include "vlc_input.c" #include "vlc_input.c"
#include "vlc_object.c"
...@@ -73,21 +73,6 @@ PyObject *MediaControl_InvalidPosition; ...@@ -73,21 +73,6 @@ PyObject *MediaControl_InvalidPosition;
PyObject *MediaControl_PlaylistException; PyObject *MediaControl_PlaylistException;
PyObject *vlcInstance_Exception; PyObject *vlcInstance_Exception;
/**********************************************************************
* VLC Object
**********************************************************************/
#define VLCSELF ( ( vlcObject* )self )
/**********************************************************************
* VLCObject Object
**********************************************************************/
typedef struct
{
PyObject_HEAD
vlc_object_t* p_object;
int b_released;
} vlcObject;
/********************************************************************** /**********************************************************************
* MediaControl Object * MediaControl Object
**********************************************************************/ **********************************************************************/
...@@ -129,7 +114,6 @@ typedef struct ...@@ -129,7 +114,6 @@ typedef struct
} vlcInput; } vlcInput;
/* Forward declarations */ /* Forward declarations */
staticforward PyTypeObject vlcObject_Type;
staticforward PyTypeObject MediaControl_Type; staticforward PyTypeObject MediaControl_Type;
staticforward PyTypeObject PyPosition_Type; staticforward PyTypeObject PyPosition_Type;
staticforward PyTypeObject vlcInstance_Type; staticforward PyTypeObject vlcInstance_Type;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment