From 351f39e1b959ccb29d05633b5f6e5eb5f331b8c2 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Tue, 28 Feb 2012 20:30:21 +0400 Subject: [PATCH] daemonc/remotecontrol.cpp: define zap_completion_timeout value as ZAP_GUARD_TIME Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4c6199eef59c1689c03827c3220e14af7f810114 Author: [CST] Focus Date: 2012-02-28 (Tue, 28 Feb 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/daemonc/remotecontrol.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/daemonc/remotecontrol.cpp b/src/daemonc/remotecontrol.cpp index fa246bef1..54e220318 100644 --- a/src/daemonc/remotecontrol.cpp +++ b/src/daemonc/remotecontrol.cpp @@ -50,6 +50,8 @@ #include #include +#define ZAP_GUARD_TIME 2000 // ms + extern CBouquetManager *g_bouquetManager; extern uint32_t scrambled_timer; @@ -124,7 +126,7 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data g_Zapit->zapTo_serviceID_NOWAIT(current_channel_id ); //g_Sectionsd->setServiceChanged(current_channel_id, false); - zap_completion_timeout = time_monotonic_ms() + 2 * (int64_t) 1000; + zap_completion_timeout = time_monotonic_ms() + ZAP_GUARD_TIME; return messages_return::handled; } @@ -660,7 +662,6 @@ const std::string & CRemoteControl::subChannelDown(void) } } -void stopAutoRecord(); void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::string & channame, const bool start_video) // UTF-8 { current_channel_id = channel_id; @@ -698,7 +699,7 @@ void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::s g_Zapit->zapTo_serviceID_NOWAIT(channel_id); //g_Sectionsd->setServiceChanged( current_channel_id, false ); - zap_completion_timeout = now + 2 * (int64_t) 1000; + zap_completion_timeout = now + ZAP_GUARD_TIME; g_RCInput->killTimer( current_programm_timer ); } }