mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit.cpp: remove trailing spaces

Browse Source
This commit is contained in:
GetAway
2021-10-18 10:40:24 +02:00
parent 79853a6840
commit f9e45c25da
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/zapit/src/zapit.cpp
View File

@@ -120,7 +120,7 @@ CZapitClient::bouquetMode bouquetMode = CZapitClient::BM_UPDATEBOUQUETS;
static bool update_pmt = true; static bool update_pmt = true;
/******************************************************************************/ /******************************************************************************/
CZapit * CZapit::zapit = NULL; CZapit * CZapit::zapit = NULL;
CZapit::CZapit() CZapit::CZapit()
: configfile(',', false) : configfile(',', false)
{ {
started = false; started = false;
@@ -263,7 +263,7 @@ void CZapit::SaveAudioMap()
} }
for (audio_map_iterator_t audio_map_it = audio_map.begin(); audio_map_it != audio_map.end(); audio_map_it++) { for (audio_map_iterator_t audio_map_it = audio_map.begin(); audio_map_it != audio_map.end(); audio_map_it++) {
fprintf(audio_config_file, "%" PRIx64 " %d %d %d %d %d %d\n", (uint64_t) audio_map_it->first, fprintf(audio_config_file, "%" PRIx64 " %d %d %d %d %d %d\n", (uint64_t) audio_map_it->first,
(int) audio_map_it->second.apid, (int) audio_map_it->second.mode, (int) audio_map_it->second.volume, (int) audio_map_it->second.apid, (int) audio_map_it->second.mode, (int) audio_map_it->second.volume,
(int) audio_map_it->second.subpid, (int) audio_map_it->second.ttxpid, (int) audio_map_it->second.ttxpage); (int) audio_map_it->second.subpid, (int) audio_map_it->second.ttxpid, (int) audio_map_it->second.ttxpage);
} }
fdatasync(fileno(audio_config_file)); fdatasync(fileno(audio_config_file));
@@ -1479,7 +1479,7 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
if(channel) if(channel)
/* FIXME: the following check is no even remotely accurate */ /* FIXME: the following check is no even remotely accurate */
response.status = (channel->getServiceType() != ST_DIGITAL_RADIO_SOUND_SERVICE); response.status = (channel->getServiceType() != ST_DIGITAL_RADIO_SOUND_SERVICE);
CBasicServer::send_data(connfd, &response, sizeof(response)); CBasicServer::send_data(connfd, &response, sizeof(response));
break; break;
} }
@@ -1504,7 +1504,7 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
PrepareChannels(); PrepareChannels();
current_channel = CServiceManager::getInstance()->FindChannel(cid); current_channel = CServiceManager::getInstance()->FindChannel(cid);
ParsePatPmt(current_channel);//reinit pids ParsePatPmt(current_channel);//reinit pids
SendCmdReady(connfd); SendCmdReady(connfd);
SendEvent(CZapitClient::EVT_SERVICES_CHANGED); SendEvent(CZapitClient::EVT_SERVICES_CHANGED);
@@ -1913,7 +1913,7 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
SendCmdReady(connfd); SendCmdReady(connfd);
break; break;
} }
#if 0 #if 0
case CZapitMessages::CMD_SET_DISPLAY_FORMAT: { case CZapitMessages::CMD_SET_DISPLAY_FORMAT: {
CZapitMessages::commandInt msg; CZapitMessages::commandInt msg;
CBasicServer::receive_data(connfd, &msg, sizeof(msg)); CBasicServer::receive_data(connfd, &msg, sizeof(msg));
@@ -2027,7 +2027,7 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
#if 0 #if 0
t_original_network_id original_network_id = msgAddSubService.original_network_id; t_original_network_id original_network_id = msgAddSubService.original_network_id;
t_service_id service_id = msgAddSubService.service_id; t_service_id service_id = msgAddSubService.service_id;
t_channel_id sub_channel_id = t_channel_id sub_channel_id =
((uint64_t) ( satellitePosition >= 0 ? satellitePosition : (uint64_t)(0xF000+ abs(satellitePosition))) << 48) | ((uint64_t) ( satellitePosition >= 0 ? satellitePosition : (uint64_t)(0xF000+ abs(satellitePosition))) << 48) |
(uint64_t) CREATE_CHANNEL_ID(msgAddSubService.service_id, msgAddSubService.original_network_id, msgAddSubService.transport_stream_id); (uint64_t) CREATE_CHANNEL_ID(msgAddSubService.service_id, msgAddSubService.original_network_id, msgAddSubService.transport_stream_id);
DBG("NVOD insert %llx\n", sub_channel_id); DBG("NVOD insert %llx\n", sub_channel_id);
@@ -2684,7 +2684,7 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
INFO("channels have been loaded succesfully"); INFO("channels have been loaded succesfully");
/* FIXME to transit from old satconfig.conf to new frontend.conf, /* FIXME to transit from old satconfig.conf to new frontend.conf,
* ConfigFrontend called after PrepareChannels, as it copy satellitePositions to every fe */ * ConfigFrontend called after PrepareChannels, as it copy satellitePositions to every fe */
LoadSettings(); LoadSettings();
ConfigFrontend(); ConfigFrontend();
@@ -2822,7 +2822,7 @@ void CZapit::run()
break; break;
} }
} }
if(!apid_found || vpid != current_channel->getVideoPid()) { if(!apid_found || vpid != current_channel->getVideoPid()) {
ZapIt(current_channel->getChannelID(), true); ZapIt(current_channel->getChannelID(), true);
} else { } else {
@@ -2942,7 +2942,7 @@ void CZapit::SetConfig(Zapit_config * Cfg)
SaveSettings(true); SaveSettings(true);
ConfigFrontend(); ConfigFrontend();
} }
#if 0 #if 0
//never used //never used
void CZapit::SendConfig(int connfd) void CZapit::SendConfig(int connfd)
{ {