[vlc-commits] modules: use VLC_TIMER_FIRE_ONCE instead of 0
Steve Lhomme
git at videolan.org
Fri Jul 6 08:07:05 CEST 2018
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Jul 5 14:42:52 2018 +0200| [84740adccb671de16d8d605dc5c54c69843a84c4] | committer: Steve Lhomme
modules: use VLC_TIMER_FIRE_ONCE instead of 0
The intent is more readable this way
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=84740adccb671de16d8d605dc5c54c69843a84c4
---
modules/access/dvdnav.c | 2 +-
modules/lua/extension.c | 9 ++++++---
modules/lua/extension_thread.c | 3 ++-
modules/stream_out/rtsp.c | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index daaa80963a..d078d5a016 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -872,7 +872,7 @@ static int Demux( demux_t *p_demux )
if( event->length != 0xff && p_sys->still.b_created )
{
vlc_tick_t delay = vlc_tick_from_sec( event->length );
- vlc_timer_schedule( p_sys->still.timer, false, delay, 0 );
+ vlc_timer_schedule( p_sys->still.timer, false, delay, VLC_TIMER_FIRE_ONCE );
}
b_still_init = true;
diff --git a/modules/lua/extension.c b/modules/lua/extension.c
index 44357ebfd1..6102deea02 100644
--- a/modules/lua/extension.c
+++ b/modules/lua/extension.c
@@ -1097,7 +1097,8 @@ int vlclua_extension_keep_alive( lua_State *L )
vlc_dialog_release( p_ext->p_sys->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, WATCH_TIMER_PERIOD, 0 );
+ vlc_timer_schedule( p_ext->p_sys->timer, false, WATCH_TIMER_PERIOD,
+ VLC_TIMER_FIRE_ONCE );
vlc_mutex_unlock( &p_ext->p_sys->command_lock );
return 1;
@@ -1201,7 +1202,8 @@ static void WatchTimerCallback( void *data )
vlc_mutex_unlock( &p_ext->p_sys->command_lock );
return;
}
- vlc_timer_schedule( p_ext->p_sys->timer, false, VLC_TICK_FROM_MS(100), 0 );
+ vlc_timer_schedule( p_ext->p_sys->timer, false, VLC_TICK_FROM_MS(100),
+ VLC_TIMER_FIRE_ONCE );
}
else
{
@@ -1213,7 +1215,8 @@ static void WatchTimerCallback( void *data )
vlc_mutex_unlock( &p_ext->p_sys->command_lock );
return;
}
- vlc_timer_schedule( p_ext->p_sys->timer, false, VLC_TICK_FROM_MS(100), 0 );
+ vlc_timer_schedule( p_ext->p_sys->timer, false, VLC_TICK_FROM_MS(100),
+ VLC_TIMER_FIRE_ONCE );
}
vlc_mutex_unlock( &p_ext->p_sys->command_lock );
}
diff --git a/modules/lua/extension_thread.c b/modules/lua/extension_thread.c
index 3c49faa232..380960c2c0 100644
--- a/modules/lua/extension_thread.c
+++ b/modules/lua/extension_thread.c
@@ -282,7 +282,8 @@ static void* Run( void *data )
p_ext->p_sys->command = cmd->next;
cmd->next = NULL; /* unlink command (for FreeCommands()) */
// Create watch timer
- vlc_timer_schedule( p_ext->p_sys->timer, false, WATCH_TIMER_PERIOD, 0 );
+ vlc_timer_schedule( p_ext->p_sys->timer, false, WATCH_TIMER_PERIOD,
+ VLC_TIMER_FIRE_ONCE );
vlc_mutex_unlock( &p_ext->p_sys->command_lock );
/* Run command */
diff --git a/modules/stream_out/rtsp.c b/modules/stream_out/rtsp.c
index 1c04252465..7d838e0cff 100644
--- a/modules/stream_out/rtsp.c
+++ b/modules/stream_out/rtsp.c
@@ -311,7 +311,7 @@ static void RtspUpdateTimer( rtsp_stream_t *rtsp )
}
if (timeout != 0)
timeout += vlc_tick_from_sec( rtsp->timeout );
- vlc_timer_schedule(rtsp->timer, true, timeout, 0);
+ vlc_timer_schedule(rtsp->timer, true, timeout, VLC_TIMER_FIRE_ONCE);
}
More information about the vlc-commits
mailing list