From aaa766acf7596eb4de7afe6ae0121335f4fd05da Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Thu, 16 Feb 2012 10:04:53 +0900 Subject: cancel_timer function renamed to rm_timer This is more consistent with adjacent add_fd and rm_fd functions. Signed-off-by: Martin Sustrik --- src/pgm_receiver.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/pgm_receiver.cpp') diff --git a/src/pgm_receiver.cpp b/src/pgm_receiver.cpp index 19866c7..c8aec2d 100644 --- a/src/pgm_receiver.cpp +++ b/src/pgm_receiver.cpp @@ -91,7 +91,7 @@ void xs::pgm_receiver_t::unplug () pending_bytes = 0; if (has_rx_timer) { - cancel_timer (rx_timer_id); + rm_timer (rx_timer_id); has_rx_timer = false; } @@ -158,7 +158,7 @@ void xs::pgm_receiver_t::in_event (fd_t fd_) return; if (has_rx_timer) { - cancel_timer (rx_timer_id); + rm_timer (rx_timer_id); has_rx_timer = false; } @@ -251,7 +251,7 @@ void xs::pgm_receiver_t::in_event (fd_t fd_) // Reset outstanding timer. if (has_rx_timer) { - cancel_timer (rx_timer_id); + rm_timer (rx_timer_id); has_rx_timer = false; } -- cgit v1.2.3