Changeset e0a120ef811bdb2d1bccdde0838105f6dba99669

Show
Ignore:
Timestamp:
05/04/08 19:45:47 (2 months ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1209923147 +0300
git-parent:

[0a9fffb92ed32d042bc16f76a3c4735d60c6f086]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1209922625 +0300
Message:

p_vlm is private data

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • include/vlc_main.h

    r0a9fffb re0a120e  
    5050    vlc_object_t          *p_interaction;    ///< interface interaction object 
    5151 
    52     vlm_t                 *p_vlm;            ///< vlm if created from libvlc-common. 
    53                                              /// (this is clearly private and 
    54                                              //  shouldn't be used) 
    55  
    5652    void                 *p_stats_computer;  ///< Input thread computing stats (needs cleanup) 
    5753    global_stats_t       *p_stats;           ///< Global statistics 
  • src/libvlc-common.c

    r0a9fffb re0a120e  
    181181    p_libvlc->p_playlist = NULL; 
    182182    p_libvlc->p_interaction = NULL; 
    183     p_libvlc->p_vlm = NULL; 
     183    priv->p_vlm = NULL; 
    184184    p_libvlc->psz_object_name = strdup( "libvlc" ); 
    185185    priv = libvlc_priv (p_libvlc); 
     
    770770    if( psz_parser && *psz_parser ) 
    771771    { 
    772         p_libvlc->p_vlm = vlm_New( p_libvlc ); 
    773         if( !p_libvlc->p_vlm ) 
     772        priv->p_vlm = vlm_New( p_libvlc ); 
     773        if( !priv->p_vlm ) 
    774774            msg_Err( p_libvlc, "VLM initialization failed" ); 
    775775    } 
     
    933933    vout_thread_t      * p_vout = NULL; 
    934934    aout_instance_t    * p_aout = NULL; 
     935    libvlc_priv_t      *priv = libvlc_priv (p_libvlc); 
    935936 
    936937    /* Ask the interfaces to stop and destroy them */ 
     
    980981 
    981982    /* Destroy VLM if created in libvlc_InternalInit */ 
    982     if( p_libvlc->p_vlm ) 
    983     { 
    984         vlm_Delete( p_libvlc->p_vlm ); 
     983    if( priv->p_vlm ) 
     984    { 
     985        vlm_Delete( priv->p_vlm ); 
    985986    } 
    986987#endif 
  • src/libvlc.h

    r0a9fffb re0a120e  
    179179 
    180180    module_t          *p_memcpy_module;  ///< Fast memcpy plugin used 
     181    vlm_t             *p_vlm;  ///< VLM if created from libvlc-common.c 
     182 
     183    httpd_t           *p_httpd; ///< HTTP daemon (src/network/httpd.c) 
    181184} libvlc_priv_t; 
    182185