Changeset 28257ce4bce64b205c41a0024a0e90a9baea01f9

Show
Ignore:
Timestamp:
29/03/08 14:54:49 (8 months ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1206798889 +0200
git-parent:

[250dcb477a7d2ee777a446e0d4dcac741912919b]

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

Input and playlist: use custom object

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/input/input.c

    r40f255a r28257ce  
    4444#include <vlc_interface.h> 
    4545#include <vlc_url.h> 
    46 #include <vlc_demux.h> 
    4746#include <vlc_charset.h> 
    4847 
    …… 
    114113 *  - length 
    115114 *  - bookmarks 
    116  *  - seekable (if you can seek, it doesn't say if 'bar display' has be shown or not, for that check position != 0.0) 
     115 *  - seekable (if you can seek, it doesn't say if 'bar display' has be shown 
     116 *    or not, for that check position != 0.0) 
    117117 *  - can-pause 
    118118 * * For intf callback upon changes 
    …… 
    123123 *****************************************************************************/ 
    124124static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, 
    125                                const char *psz_header, vlc_bool_t b_quick, sout_instance_t *p_sout ) 
    126 { 
     125                               const char *psz_header, vlc_bool_t b_quick, 
     126                               sout_instance_t *p_sout ) 
     127{ 
     128    static const char input_name[] = "input"; 
    127129    input_thread_t *p_input = NULL;                 /* thread descriptor */ 
    128130    vlc_value_t val; 
    …… 
    130132 
    131133    /* Allocate descriptor */ 
    132     p_input = vlc_object_create( p_parent, VLC_OBJECT_INPUT ); 
     134    p_input = vlc_custom_create( p_parent, sizeof( *p_input ), 
     135                                 VLC_OBJECT_INPUT, input_name ); 
    133136    if( p_input == NULL ) 
    134137    { 

  • src/misc/objects.c

    ra9d773c r28257ce  
    4949#include "stream_output/stream_output.h" 
    5050 
    51 #include "vlc_playlist.h" 
    5251#include "vlc_interface.h" 
    5352#include "vlc_codec.h" 
    …… 
    256255            i_size = sizeof(intf_thread_t); 
    257256            psz_type = "dialogs"; 
    258             break; 
    259         case VLC_OBJECT_PLAYLIST: 
    260             i_size = sizeof(playlist_t); 
    261             psz_type = "playlist"; 
    262             break; 
    263         case VLC_OBJECT_INPUT: 
    264             i_size = sizeof(input_thread_t); 
    265             psz_type = "input"; 
    266257            break; 
    267258        case VLC_OBJECT_DEMUX: 

  • src/playlist/engine.c

    r6751879 r28257ce  
    6060playlist_t * playlist_Create( vlc_object_t *p_parent ) 
    6161{ 
     62    static const char playlist_name[] = "playlist"; 
    6263    playlist_t *p_playlist; 
    6364    vlc_bool_t b_save; 
    …… 
    6566 
    6667    /* Allocate structure */ 
    67     p_playlist = vlc_object_create( p_parent, VLC_OBJECT_PLAYLIST ); 
     68    p_playlist = vlc_custom_create( p_parent, sizeof( *p_playlist ), 
     69                                    VLC_OBJECT_PLAYLIST, playlist_name ); 
    6870    if( !p_playlist ) 
    6971    {