Changeset ef04b504e982994a09e755c45e692d96a5f08c6e

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

[7db96bf8cb3e9a57917f3297e68b6f33f573b944]

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

We know where VLM is, no need to find it.

Now we can remove the VLM object type.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/vlc_objects.h

    r38276a4 ref04b50  
    5252#define VLC_OBJECT_ENCODER     (-14) 
    5353#define VLC_OBJECT_DIALOGS     (-15) 
    54 #define VLC_OBJECT_VLM         (-16) 
     54 
    5555#define VLC_OBJECT_ANNOUNCE    (-17) 
    5656#define VLC_OBJECT_DEMUX       (-18) 

  • modules/misc/lua/objects.c

    r38276a4 ref04b50  
    120120          { VLC_OBJECT_ENCODER, "encoder" }, 
    121121          { VLC_OBJECT_DIALOGS, "dialogs" }, 
    122           { VLC_OBJECT_VLM, "vlm" }, 
    123122          { VLC_OBJECT_ANNOUNCE, "announce" }, 
    124123          { VLC_OBJECT_DEMUX, "demux" }, 

  • modules/misc/lua/vlm.c

    r99fab90 ref04b50  
    5757int vlclua_vlm_delete( lua_State *L ) 
    5858{ 
    59     vlm_t *p_vlm = (vlm_t*)vlclua_checkobject( L, 1, VLC_OBJECT_VLM ); 
     59    vlm_t *p_vlm = (vlm_t*)vlclua_checkobject( L, 1, VLC_OBJECT_GENERIC ); 
    6060    vlm_Delete( p_vlm ); 
    6161    return 0; 
    …… 
    8989int vlclua_vlm_execute_command( lua_State *L ) 
    9090{ 
    91     vlm_t *p_vlm = (vlm_t*)vlclua_checkobject( L, 1, VLC_OBJECT_VLM ); 
     91    vlm_t *p_vlm = (vlm_t*)vlclua_checkobject( L, 1, VLC_OBJECT_GENERIC ); 
    9292    const char *psz_command = luaL_checkstring( L, 2 ); 
    9393    vlm_message_t *message; 

  • src/input/vlm.c

    r6da90a1 ref04b50  
    101101{ 
    102102    vlc_value_t lockval; 
    103     vlm_t *p_vlm = NULL; 
     103    vlm_t *p_vlm = NULL, **pp_vlm = &(libvlc_priv (p_this->p_libvlc)->p_vlm); 
    104104    char *psz_vlmconf; 
    105105    static const char vlm_object_name[] = "vlm daemon"; 
    …… 
    112112    vlc_mutex_lock( lockval.p_address ); 
    113113 
    114     p_vlm = vlc_object_find( p_this, VLC_OBJECT_VLM, FIND_ANYWHERE ); 
     114    p_vlm = *pp_vlm; 
    115115    if( p_vlm ) 
    116     { 
     116    {   /* VLM already exists */ 
    117117        vlc_object_yield( p_vlm ); 
    118118        vlc_mutex_unlock( lockval.p_address ); 
    …… 
    122122    msg_Dbg( p_this, "creating VLM" ); 
    123123 
    124     p_vlm = vlc_custom_create( p_this, sizeof( *p_vlm ), VLC_OBJECT_VLM, 
     124    p_vlm = vlc_custom_create( p_this, sizeof( *p_vlm ), VLC_OBJECT_GENERIC, 
    125125                               vlm_object_name ); 
    126126    if( !p_vlm ) 
    …… 
    168168 
    169169    vlc_object_set_destructor( p_vlm, (vlc_destructor_t)vlm_Destructor ); 
     170    *pp_vlm = p_vlm; /* for future reference */ 
    170171    vlc_mutex_unlock( lockval.p_address ); 
    171172