Changeset 35506f4d2f1f31e36eb8fe09f6cd1cb602065507

Show
Ignore:
Timestamp:
27/09/08 19:18:20 (2 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1222535900 +0200
git-parent:

[d228fdd28ef03b992c97af16cb842acd7c879831]

git-author:
Pierre d'Herbemont <pdherbemont@videolan.org> 1222535900 +0200
Message:

playlist: items_to_delete is now private.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/vlc_playlist.h

    rd228fdd r35506f4  
    161161    playlist_item_array_t items; /**< Arrays of items */ 
    162162    playlist_item_array_t all_items; /**< Array of items and nodes */ 
    163     playlist_item_array_t items_to_delete; /**< Array of items and nodes to 
    164             delete... At the very end. This sucks. */ 
    165163 
    166164    playlist_item_array_t current; /**< Items currently being played */ 

  • src/playlist/engine.c

    rd228fdd r35506f4  
    8888    ARRAY_INIT( p_playlist->items ); 
    8989    ARRAY_INIT( p_playlist->all_items ); 
    90     ARRAY_INIT( p_playlist->items_to_delete ); 
     90    ARRAY_INIT( pl_priv(p_playlist)->items_to_delete ); 
    9191    ARRAY_INIT( p_playlist->current ); 
    9292 
    …… 
    555555    FOREACH_END(); 
    556556    ARRAY_RESET( p_playlist->all_items ); 
    557     FOREACH_ARRAY( playlist_item_t *p_del, p_playlist->items_to_delete ) 
     557    FOREACH_ARRAY( playlist_item_t *p_del, pl_priv(p_playlist)->items_to_delete ) 
    558558        free( p_del->pp_children ); 
    559559        vlc_gc_decref( p_del->p_input ); 
    560560        free( p_del ); 
    561561    FOREACH_END(); 
    562     ARRAY_RESET( p_playlist->items_to_delete ); 
     562    ARRAY_RESET( pl_priv(p_playlist)->items_to_delete ); 
    563563 
    564564    ARRAY_RESET( p_playlist->items ); 

  • src/playlist/item.c

    rd228fdd r35506f4  
    221221     * Who wants to add proper memory management? */ 
    222222    uninstall_input_item_observer( p_item ); 
    223     ARRAY_APPEND( p_item->p_playlist->items_to_delete, p_item); 
     223    ARRAY_APPEND( pl_priv(p_playlist)->items_to_delete, p_item); 
    224224    return VLC_SUCCESS; 
    225225} 

  • src/playlist/playlist_internal.h

    rd228fdd r35506f4  
    6767    playlist_fetcher_t   fetcher; /**< Meta and art fetcher data */ 
    6868    sout_instance_t      *p_sout; /**< Kept sout instance */ 
     69 
     70    playlist_item_array_t items_to_delete; /**< Array of items and nodes to 
     71            delete... At the very end. This sucks. */ 
    6972 
    7073    struct playlist_services_discovery_support_t {