Changeset c90b3db3af8af023ce9d76b989a3000a896c65df

Show
Ignore:
Timestamp:
03/23/08 01:16:36 (5 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1206231396 +0100
git-parent:

[05dc64af7e19036bbf6fa538345b5a2278a1d91f]

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

input: Remove input_DestroyThread() as it is now handled via vlc_object_release().

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/vlc_input.h

    rbf4a300 rc90b3db  
    645645 * Prototypes 
    646646 *****************************************************************************/ 
     647 
     648/* input_CreateThread 
     649 * Release the returned input_thread_t using vlc_object_release() */ 
    647650#define input_CreateThread(a,b) __input_CreateThread(VLC_OBJECT(a),b) 
    648651VLC_EXPORT( input_thread_t *, __input_CreateThread, ( vlc_object_t *, input_item_t * ) ); 
     652 
    649653#define input_Preparse(a,b) __input_Preparse(VLC_OBJECT(a),b) 
    650654VLC_EXPORT( int, __input_Preparse, ( vlc_object_t *, input_item_t * ) ); 
    …… 
    653657VLC_EXPORT( int, __input_Read, ( vlc_object_t *, input_item_t *, vlc_bool_t ) ); 
    654658VLC_EXPORT( void,             input_StopThread,     ( input_thread_t * ) ); 
    655 VLC_EXPORT( void,             input_DestroyThread,  ( input_thread_t * ) ); 
    656659 
    657660enum input_query_e 

  • modules/services_discovery/podcast.c

    rac175b3 rc90b3db  
    136136        { 
    137137            input_StopThread( p_sd->p_sys->pp_input[i] ); 
    138             input_DestroyThread( p_sd->p_sys->pp_input[i] ); 
     138            vlc_object_release( p_sd->p_sys->pp_input[i] ); 
    139139            p_sd->p_sys->pp_input[i] = NULL; 
    140140        } 
    …… 
    176176            { 
    177177                input_StopThread( p_sd->p_sys->pp_input[i] ); 
    178                 input_DestroyThread( p_sd->p_sys->pp_input[i] ); 
     178                vlc_object_release( p_sd->p_sys->pp_input[i] ); 
    179179                p_sd->p_sys->pp_input[i] = NULL; 
    180180                REMOVE_ELEM( p_sys->pp_input, p_sys->i_input, i ); 

  • src/control/media_instance.c

    r37558f4 rc90b3db  
    9393        /* We owned this one */ 
    9494        input_StopThread( p_input_thread ); 
    95         input_DestroyThread( p_input_thread ); 
    9695 
    9796        var_Destroy( p_input_thread, "drawable" ); 
    9897    } 
    99     else 
    100         vlc_object_release( p_input_thread ); 
     98 
     99    vlc_object_release( p_input_thread ); 
    101100 
    102101    p_mi->p_input_thread = NULL; 
    …… 
    423422    vlc_mutex_destroy( &p_mi->object_lock ); 
    424423 
    425     input_DestroyThread( p_input_thread ); 
     424    vlc_object_release( p_input_thread ); 
    426425 
    427426    libvlc_media_descriptor_release( p_mi->p_md ); 

  • src/input/input.c

    r33e3f3d rc90b3db  
    479479} 
    480480 
    481 /** 
    482  * Clean up a dead input thread 
    483  * This function does not return until the thread is effectively cancelled. 
    484  * 
    485  * \param the input thread to kill 
    486  */ 
    487 void input_DestroyThread( input_thread_t *p_input ) 
    488 { 
    489     /* Join the thread */ 
    490     vlc_thread_join( p_input ); 
    491  
    492     /* */ 
    493     vlc_object_detach( p_input ); 
    494     vlc_object_release( p_input ); 
    495 } 
    496  
    497481/***************************************************************************** 
    498482 * Run: main thread loop 

  • src/input/vlm.c

    r540c761 rc90b3db  
    22632263 
    22642264                input_StopThread( p_input ); 
    2265                 input_DestroyThread( p_input ); 
     2265                vlc_object_release( p_input ); 
    22662266            } 
    22672267            free( psz_output ); 
    …… 
    25002500        input_StopThread( p_instance->p_input ); 
    25012501        p_instance->p_sout = input_DetachSout( p_instance->p_input ); 
    2502         input_DestroyThread( p_instance->p_input ); 
     2502        vlc_object_release( p_instance->p_input ); 
    25032503    } 
    25042504    if( p_instance->p_sout ) 
    …… 
    25842584        input_StopThread( p_instance->p_input ); 
    25852585        p_instance->p_sout = input_DetachSout( p_instance->p_input ); 
    2586         input_DestroyThread( p_instance->p_input ); 
     2586        vlc_object_release( p_instance->p_input ); 
    25872587        if( !p_instance->b_sout_keep && p_instance->p_sout ) 
    25882588        { 

  • src/libvlc.sym

    r30b0fc0 rc90b3db  
    128128input_DecoderDelete 
    129129input_DecoderNew 
    130 input_DestroyThread 
    131130input_GetItem 
    132131input_ItemAddInfo 

  • src/playlist/engine.c

    r55f3a9f rc90b3db  
    274274 
    275275            /* Release the playlist lock, because we may get stuck 
    276              * in input_DestroyThread() for some time. */ 
     276             * in vlc_object_release() for some time. */ 
    277277            PL_UNLOCK; 
    278278 
    279279            /* Destroy input */ 
    280             input_DestroyThread( p_input ); 
     280            vlc_object_release( p_input ); 
    281281 
    282282            PL_LOCK; 
    …… 
    409409 
    410410            /* Destroy input */ 
    411             input_DestroyThread( p_input ); 
     411            vlc_object_release( p_input ); 
    412412            continue; 
    413413        }