videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-10-03 01:31:53 +02:00
Code Releases Activity

modules: use vlc_timer_disarm() instead of a call with 0 delay

Browse Source 
The intent is more readable this way and can be reworked later.
This commit is contained in:
Steve Lhomme 2018-07-05 14:35:10 +02:00
parent 83df889ad5
commit 543e9fb997
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/access/dvdnav.c
View File

@ -836,7 +836,7 @@ static int Demux( demux_t *p_demux )
{
case DVDNAV_BLOCK_OK: /* mpeg block */
vlc_mutex_lock( &p_sys->still.lock );
vlc_timer_schedule( p_sys->still.timer, false, 0, 0 );
vlc_timer_disarm( p_sys->still.timer );
p_sys->still.b_enabled = false;
vlc_mutex_unlock( &p_sys->still.lock );
if( p_sys->b_reset_pcr )

2
modules/access/live555.cpp
View File

@ -1777,7 +1777,7 @@ static int RollOverTcp( demux_t *p_demux )
var_SetBool( p_demux, "rtsp-tcp", true );
/* We close the old RTSP session */
vlc_timer_schedule(p_sys->timer, false, 0, 0);
vlc_timer_disarm(p_sys->timer);
p_sys->rtsp->sendTeardownCommand( *p_sys->ms, NULL );
Medium::close( p_sys->ms );
RTSPClient::close( p_sys->rtsp );

2
modules/audio_output/waveout.c
View File

@ -911,7 +911,7 @@ static void WaveOutPause( audio_output_t * p_aout, bool pause, vlc_tick_t date)
}
else
{
vlc_timer_schedule( sys->volume_poll_timer, false, 0, 0 );
vlc_timer_disarm( sys->volume_poll_timer );
res = waveOutRestart( sys->h_waveout );
if( res != MMSYSERR_NOERROR )
{

2
modules/lua/extension_thread.c
View File

@ -385,7 +385,7 @@ static void* Run( void *data )
vlc_dialog_release( p_mgr, p_ext->p_sys->p_progress_id );
p_ext->p_sys->p_progress_id = NULL;
}
vlc_timer_schedule( p_ext->p_sys->timer, false, 0, 0 );
vlc_timer_disarm( p_ext->p_sys->timer );
}
vlc_mutex_unlock( &p_ext->p_sys->command_lock );

2
modules/misc/inhibit/xdg.c
View File

@ -76,7 +76,7 @@ static void Inhibit (vlc_inhibit_t *ih, unsigned mask)
{
vlc_inhibit_sys_t *sys = ih->p_sys;
bool suspend = (mask & VLC_INHIBIT_DISPLAY) != 0;
vlc_tick_t delay = suspend ? VLC_TICK_FROM_SEC(30): INT64_C(0);
vlc_tick_t delay = suspend ? VLC_TICK_FROM_SEC(30): VLC_TIMER_DISARM;
vlc_timer_schedule (sys->timer, false, delay, delay);
}