Changeset 7b89d13c0ef3a66054f1e61db7ddf243fddebccd

Show
Ignore:
Timestamp:
01/05/07 20:15:16 (2 years ago)
Author:
Olivier Aubert <olivier.aubert@liris.cnrs.fr>
git-committer:
Olivier Aubert <olivier.aubert@liris.cnrs.fr> 1168024516 +0000
git-parent:

[a5c6ef976452b28fe34cab82e9597b1f93c17efd]

git-author:
Olivier Aubert <olivier.aubert@liris.cnrs.fr> 1168024516 +0000
Message:

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.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • bindings/python/setup.py

    rc2d31f4 r7b89d13  
    6666        return ldflags 
    6767 
    68 #source_files = [ 'vlc_module.c', 'vlc_object.c', 'vlc_mediacontrol.c', 
     68#source_files = [ 'vlc_module.c', 'vlc_mediacontrol.c', 
    6969#                 'vlc_position.c', 'vlc_instance.c', 'vlc_input.c' ] 
    7070source_files = [ 'vlc_module.c' ] 
    …… 
    9292video player. Documentation can be found on the VLC wiki :  
    9393http://wiki.videolan.org/index.php/ExternalAPI 
    94  
    95 The module also provides a Object type, which gives a low-level access 
    96 to the vlc objects and their variables. 
    9794 
    9895This module also provides a MediaControl object, which implements an 
    …… 
    125122# Get status information 
    126123mc.get_stream_information() 
    127  
    128 # Access lowlevel objets 
    129 o=vlc.Object(1) 
    130 o.info() 
    131 i=o.find_object('input') 
    132 i.list() 
    133 i.get('time') 
    134  
    135124       """, 
    136125       ext_modules = [ vlclocal ]) 

  • bindings/python/vlc_module.c

    rc9958ed r7b89d13  
    2121 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. 
    2222 *****************************************************************************/ 
    23  
    24 /* We need to access some internal features of VLC (for vlc_object) */ 
    25 /* This is gruik as we are not libvlc at all */ 
    26 #define __LIBVLC__ 
    27  
    2823 
    2924#include "vlcglue.h" 
    …… 
    6863        return; 
    6964    if( PyType_Ready( &MediaControl_Type ) < 0 ) 
    70         return; 
    71     if( PyType_Ready( &vlcObject_Type ) < 0 ) 
    7265        return; 
    7366    if( PyType_Ready( &vlcInstance_Type ) < 0 ) 
    …… 
    123116                        ( PyObject * )&MediaControl_Type ); 
    124117 
    125     Py_INCREF( &vlcObject_Type ); 
    126     PyModule_AddObject( p_module, "Object", 
    127                         ( PyObject * )&vlcObject_Type ); 
    128118    Py_INCREF( &vlcInstance_Type ); 
    129119    PyModule_AddObject( p_module, "Instance", 
    …… 
    181171#include "vlc_instance.c" 
    182172#include "vlc_input.c" 
    183 #include "vlc_object.c" 

  • bindings/python/vlcglue.h

    rc9958ed r7b89d13  
    7575 
    7676/********************************************************************** 
    77  * VLC Object 
    78  **********************************************************************/ 
    79 #define VLCSELF ( ( vlcObject* )self ) 
    80  
    81 /********************************************************************** 
    82  * VLCObject Object 
    83  **********************************************************************/ 
    84 typedef struct 
    85 { 
    86     PyObject_HEAD 
    87     vlc_object_t* p_object; 
    88     int b_released; 
    89 } vlcObject; 
    90  
    91 /********************************************************************** 
    9277 * MediaControl Object 
    9378 **********************************************************************/ 
    …… 
    130115 
    131116/* Forward declarations */ 
    132 staticforward PyTypeObject vlcObject_Type; 
    133117staticforward PyTypeObject MediaControl_Type; 
    134118staticforward PyTypeObject PyPosition_Type;