mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

daemonc/remotecontrol.cpp: define zap_completion_timeout value as ZAP_GUARD_TIME

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c6199eef5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-28 (Tue, 28 Feb 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-02-28 20:30:21 +04:00
parent 2e5e00beae
commit 351f39e1b9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/daemonc/remotecontrol.cpp
View File

@@ -50,6 +50,8 @@
#include <zapit/zapit.h> #include <zapit/zapit.h>
#include <zapit/getservices.h> #include <zapit/getservices.h>
#define ZAP_GUARD_TIME 2000 // ms
extern CBouquetManager *g_bouquetManager; extern CBouquetManager *g_bouquetManager;
extern uint32_t scrambled_timer; 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_Zapit->zapTo_serviceID_NOWAIT(current_channel_id );
//g_Sectionsd->setServiceChanged(current_channel_id, false); //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; 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 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; 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_Zapit->zapTo_serviceID_NOWAIT(channel_id);
//g_Sectionsd->setServiceChanged( current_channel_id, false ); //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 ); g_RCInput->killTimer( current_programm_timer );
} }
} }