vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Jul 8 20:31:33 2015 +0300| [488bcb3b94b0817459721e59bf124c5c5d70a83a] | committer: Rémi Denis-Courmont
fingerprinter: remove duplicate code Close() already clears the array (while destroying it). > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=488bcb3b94b0817459721e59bf124c5c5d70a83a --- modules/misc/fingerprinter.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/modules/misc/fingerprinter.c b/modules/misc/fingerprinter.c index 868fbfe..47db959 100644 --- a/modules/misc/fingerprinter.c +++ b/modules/misc/fingerprinter.c @@ -336,13 +336,6 @@ static void fill_metas_with_results( fingerprint_request_t *p_r, acoustid_finger /***************************************************************************** * Run : *****************************************************************************/ -static void cancelRun( void * p_arg ) -{ - fingerprinter_sys_t *p_sys = ( fingerprinter_sys_t * ) p_arg; - if ( vlc_array_count( p_sys->processing.queue ) ) - vlc_array_clear( p_sys->processing.queue ); -} - static void Run( fingerprinter_thread_t *p_fingerprinter ) { fingerprinter_sys_t *p_sys = p_fingerprinter->p_sys; @@ -359,7 +352,6 @@ static void Run( fingerprinter_thread_t *p_fingerprinter ) vlc_mutex_lock( &p_sys->processing.lock ); // L0 mutex_cleanup_push( &p_sys->processing.lock ); - vlc_cleanup_push( cancelRun, p_sys ); // C1 //** for ( p_sys->i = 0 ; p_sys->i < vlc_array_count( p_sys->processing.queue ); p_sys->i++ ) { @@ -405,7 +397,6 @@ static void Run( fingerprinter_thread_t *p_fingerprinter ) var_TriggerCallback( p_fingerprinter, "results-available" ); vlc_array_clear( p_sys->processing.queue ); } - vlc_cleanup_pop( ); // C1 //** vlc_cleanup_run(); // L0 } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
