← Back to branch summary

~videolan/vlc/old-trunk

« back to all changes in this revision

Viewing changes to src/misc/vlm.c

  • Committer: zorglub
  • Date: 2006-09-24 12:40:10 UTC
  • Revision ID: vcs-imports@canonical.com-20060924124010-9313cccc4d61dbc9
Rename vlc_input_item_* functions to input_Item* for consistency
Add input_ItemAddOptionNoDup (unused at the moment)
+ free warning fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/misc/vlm.c
2
2
 * vlm.c: VLM interface plugin
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2000-2005 the VideoLAN team
5
 
 * $Id: vlm.c 16658 2006-09-15 14:31:51Z zorglub $
 
5
 * $Id: vlm.c 16821 2006-09-24 12:40:10Z zorglub $
6
6
 *
7
7
 * Authors: Simon Latapie <garf@videolan.org>
8
8
 *          Laurent Aimar <fenrir@videolan.org>
932
932
    media->i_instance = 0;
933
933
    media->instance = NULL;
934
934
 
935
 
    vlc_input_item_Init( VLC_OBJECT(vlm), &media->item );
 
935
    input_ItemInit( VLC_OBJECT(vlm), &media->item );
936
936
 
937
937
    TAB_APPEND( vlm->i_media, vlm->media, media );
938
938
 
980
980
    while( media->i_option-- ) free( media->option[media->i_option] );
981
981
    if( media->option ) free( media->option );
982
982
 
983
 
    vlc_input_item_Clean( &media->item );
 
983
    input_ItemClean( &media->item );
984
984
 
985
985
    free( media );
986
986
}
1113
1113
            char *psz_header;
1114
1114
            int i;
1115
1115
 
1116
 
            vlc_input_item_Clean( &media->item );
1117
 
            vlc_input_item_Init( VLC_OBJECT(vlm), &media->item );
 
1116
            input_ItemClean( &media->item );
 
1117
            input_ItemInit( VLC_OBJECT(vlm), &media->item );
1118
1118
 
1119
1119
            if( media->psz_output )
1120
1120
                asprintf( &psz_output, "%s:description", media->psz_output );
1197
1197
            p_instance = malloc( sizeof(vlm_media_instance_t) );
1198
1198
            if( !p_instance ) return VLC_EGENERIC;
1199
1199
            memset( p_instance, 0, sizeof(vlm_media_instance_t) );
1200
 
            vlc_input_item_Init( VLC_OBJECT(vlm), &p_instance->item );
 
1200
            input_ItemInit( VLC_OBJECT(vlm), &p_instance->item );
1201
1201
            p_instance->p_input = NULL;
1202
1202
 
1203
1203
            if( ( media->psz_output != NULL ) || ( media->psz_vod_output != NULL ) )
1248
1248
        if( !p_instance->p_input )
1249
1249
        {
1250
1250
            TAB_REMOVE( media->i_instance, media->instance, p_instance );
1251
 
            vlc_input_item_Clean( &p_instance->item );
 
1251
            input_ItemClean( &p_instance->item );
1252
1252
            if( p_instance->psz_name ) free( p_instance->psz_name );
1253
1253
        }
1254
1254
        free( psz_header );
1320
1320
            vlc_object_destroy( p_instance->p_input );
1321
1321
        }
1322
1322
 
1323
 
        vlc_input_item_Clean( &p_instance->item );
 
1323
        input_ItemClean( &p_instance->item );
1324
1324
        if( p_instance->psz_name ) free( p_instance->psz_name );
1325
1325
        free( p_instance );
1326
1326