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

diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index 60f541f9946e8be99bb46c9d379289197c81b2ab..60a358bf58890560fe437767e15627912b616069 100644 (file)
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -65,7 +65,7 @@ def get_ldflags():
            ldflags.append('-lstdc++')
         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' ]
 source_files = [ 'vlc_module.c' ]
 
@@ -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 : 
 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
 API inspired from the OMG Audio/Video Stream 1.0 specification.
 Documentation can be found on the VLC wiki :
@@ -124,13 +121,5 @@ mc.pause(0)
 
 # Get status 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 ])

diff --git a/bindings/python/vlc_module.c b/bindings/python/vlc_module.c
index f3995e666a73a1f9c4b01e662ac14bf9bdbb32c8..ffccabf432024ed450fa46319c5eb85249951c21 100644 (file)
--- a/bindings/python/vlc_module.c
+++ b/bindings/python/vlc_module.c
@@ -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"

diff --git a/bindings/python/vlcglue.h b/bindings/python/vlcglue.h
index 22e3d9d4faa89eca8fb5f6d0020d204a2a76373d..16f0bd47e60a3689e8fbffa1b0796068629cd737 100644 (file)
--- a/bindings/python/vlcglue.h
+++ b/bindings/python/vlcglue.h
@@ -73,21 +73,6 @@ PyObject *MediaControl_InvalidPosition;
 PyObject *MediaControl_PlaylistException;
 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
  **********************************************************************/
@@ -129,7 +114,6 @@ typedef struct
 } vlcInput;
 
 /* Forward declarations */
-staticforward PyTypeObject vlcObject_Type;
 staticforward PyTypeObject MediaControl_Type;
 staticforward PyTypeObject PyPosition_Type;
 staticforward PyTypeObject vlcInstance_Type;