Changeset e1f1b1e2e69cde5937ed22465ebd29dfd4510b5e

Show
Ignore:
Timestamp:
19/08/08 17:22:12 (4 months ago)
Author:
Rémi Denis-Courmont <rdenis@simphalempin.com>
git-committer:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1219159332 +0300
git-parent:

[9674dc7c39b01ade92a8cb7cc0ad91b4d0db9458]

git-author:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1219159332 +0300
Message:

libvlccore: the object counter is specific so misc/objects.c

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/libvlc.h

    rf6c0a1a re1f1b1e  
    154154{ 
    155155    VLC_COMMON_MEMBERS 
    156  
    157     /* Object structure data */ 
    158     int                    i_counter;   ///< object counter 
    159156 
    160157    module_bank_t *        p_module_bank; ///< The module bank 

  • src/misc/objects.c

    r1fe2080 re1f1b1e  
    9595 * Local structure lock 
    9696 *****************************************************************************/ 
    97 static vlc_mutex_t     structure_lock; 
     97static vlc_mutex_t structure_lock; 
     98static unsigned    object_counter = 0; 
    9899 
    99100void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size, 
    …… 
    149150        p_new->p_libvlc = NULL; 
    150151 
    151         p_libvlc_global->i_counter = 0; 
     152        object_counter = 0; /* reset */ 
    152153        p_priv->next = p_priv->prev = p_new; 
    153154        vlc_mutex_init( &structure_lock ); 
    …… 
    195196    vlc_internals (p_libvlc_global)->prev = p_new; 
    196197    vlc_internals (p_priv->prev)->next = p_new; 
    197     p_new->i_object_id = p_libvlc_global->i_counter++; 
     198    p_new->i_object_id = object_counter++; /* fetch THEN increment */ 
    198199    vlc_mutex_unlock( &structure_lock ); 
    199200