mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

change 'long long' tom int64_t'; change variable buf to new delete;

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@291 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-02-07 14:32:21 +00:00
parent 0e9897a200
commit 8f59cc96ec
43 changed files with 202 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/daemonc/remotecontrol.cpp
View File

@@ -117,7 +117,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 &0xFFFFFFFFFFFFULL, false);
zap_completion_timeout = getcurrenttime() + 2 * (long long) 1000000;
zap_completion_timeout = getcurrenttime() + 2 * (int64_t) 1000000;
return messages_return::handled;
}
@@ -384,7 +384,7 @@ void CRemoteControl::getNVODs()
NVODs[i].original_network_id,
NVODs[i].service_id,
NVODs[i].transport_stream_id,
NVODs[i].zeit.startzeit,
NVODs[i].zeit.startzeit,
NVODs[i].zeit.dauer);
CSubServiceListSorted::iterator e= subChannels.begin();
@@ -629,7 +629,7 @@ void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::s
needs_nvods = false;
director_mode = 0;
unsigned long long now = getcurrenttime();
uint64_t now = getcurrenttime();
if ( zap_completion_timeout < now )
{
g_InfoViewer->chanready = 0;
@@ -647,7 +647,7 @@ void CRemoteControl::zapTo_ChannelID(const t_channel_id channel_id, const std::s
g_Sectionsd->setServiceChanged( current_channel_id&0xFFFFFFFFFFFFULL, false );
abort_zapit = 0;
zap_completion_timeout = now + 2 * (long long) 1000000;
zap_completion_timeout = now + 2 * (int64_t) 1000000;
if ( current_programm_timer != 0 )
{
g_RCInput->killTimer( current_programm_timer );

6
src/daemonc/remotecontrol.h
View File

@@ -71,7 +71,7 @@ typedef std::vector<CSubService> CSubServiceListSorted;
class CRemoteControl
{
unsigned int current_programm_timer;
unsigned long long zap_completion_timeout;
uint64_t zap_completion_timeout;
std::string current_channel_name;
t_channel_id current_sub_channel_id;
@@ -81,8 +81,8 @@ class CRemoteControl
public:
t_channel_id current_channel_id;
unsigned long long current_EPGid;
unsigned long long next_EPGid;
uint64_t current_EPGid;
uint64_t next_EPGid;
CZapitClient::responseGetPIDs current_PIDs;
// APID - Details