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

zapit/src/zapit.cpp: comment unused messages

Browse Source
This commit is contained in:
[CST] Focus
2012-04-20 15:33:39 +04:00
parent e241757884
commit 6a8071f87a
1 changed files with 54 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
src/zapit/src/zapit.cpp
View File

@@ -751,9 +751,15 @@ bool CZapit::StartFastScan(int scan_mode, int opid)
return true; return true;
} }
bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd) void CZapit::SendCmdReady(int connfd)
{ {
CZapitMessages::responseCmd response; CZapitMessages::responseCmd response;
response.cmd = CZapitMessages::CMD_READY;
CBasicServer::send_data(connfd, &response, sizeof(response));
}
bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
{
DBG("cmd %d (version %d) received\n", rmsg.cmd, rmsg.version); DBG("cmd %d (version %d) received\n", rmsg.cmd, rmsg.version);
if ((standby) && ((rmsg.cmd != CZapitMessages::CMD_SET_VOLUME) if ((standby) && ((rmsg.cmd != CZapitMessages::CMD_SET_VOLUME)
@@ -885,23 +891,23 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
} }
case CZapitMessages::CMD_GET_DELIVERY_SYSTEM: { case CZapitMessages::CMD_GET_DELIVERY_SYSTEM: {
CZapitMessages::responseDeliverySystem _response; CZapitMessages::responseDeliverySystem response;
switch (live_fe->getInfo()->type) { switch (live_fe->getInfo()->type) {
case FE_QAM: case FE_QAM:
_response.system = DVB_C; response.system = DVB_C;
break; break;
case FE_QPSK: case FE_QPSK:
_response.system = DVB_S; response.system = DVB_S;
break; break;
case FE_OFDM: case FE_OFDM:
_response.system = DVB_T; response.system = DVB_T;
break; break;
default: default:
WARN("Unknown type %d", live_fe->getInfo()->type); WARN("Unknown type %d", live_fe->getInfo()->type);
return false; return false;
} }
CBasicServer::send_data(connfd, &_response, sizeof(_response)); CBasicServer::send_data(connfd, &response, sizeof(response));
break; break;
} }
@@ -934,38 +940,32 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
case CZapitMessages::CMD_GET_CHANNEL_NAME: { case CZapitMessages::CMD_GET_CHANNEL_NAME: {
t_channel_id requested_channel_id; t_channel_id requested_channel_id;
CZapitMessages::responseGetChannelName _response; CZapitMessages::responseGetChannelName response;
CBasicServer::receive_data(connfd, &requested_channel_id, sizeof(requested_channel_id)); CBasicServer::receive_data(connfd, &requested_channel_id, sizeof(requested_channel_id));
_response.name[0] = 0; response.name[0] = 0;
if(requested_channel_id == 0) { CZapitChannel * channel = (requested_channel_id == 0) ? current_channel :
if(current_channel) { CServiceManager::getInstance()->FindChannel(requested_channel_id);
strncpy(_response.name, current_channel->getName().c_str(), CHANNEL_NAME_SIZE);
_response.name[CHANNEL_NAME_SIZE-1] = 0;
}
} else {
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(requested_channel_id);
if(channel) { if(channel) {
strncpy(_response.name, channel->getName().c_str(), CHANNEL_NAME_SIZE); strncpy(response.name, channel->getName().c_str(), CHANNEL_NAME_SIZE);
_response.name[CHANNEL_NAME_SIZE-1] = 0; response.name[CHANNEL_NAME_SIZE-1] = 0;
} }
} CBasicServer::send_data(connfd, &response, sizeof(response));
CBasicServer::send_data(connfd, &_response, sizeof(_response));
break; break;
} }
#if 0 #if 0
case CZapitMessages::CMD_IS_TV_CHANNEL: { case CZapitMessages::CMD_IS_TV_CHANNEL: {
t_channel_id requested_channel_id; t_channel_id requested_channel_id;
CZapitMessages::responseGeneralTrueFalse _response; CZapitMessages::responseGeneralTrueFalse response;
CBasicServer::receive_data(connfd, &requested_channel_id, sizeof(requested_channel_id)); CBasicServer::receive_data(connfd, &requested_channel_id, sizeof(requested_channel_id));
/* if in doubt (i.e. unknown channel) answer yes */ /* if in doubt (i.e. unknown channel) answer yes */
_response.status = true; response.status = true;
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(requested_channel_id); CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(requested_channel_id);
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;
} }
#endif #endif
@@ -978,8 +978,7 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
g_bouquetManager->clearAll(); g_bouquetManager->clearAll();
g_bouquetManager->loadBouquets(); g_bouquetManager->loadBouquets();
} }
response.cmd = CZapitMessages::CMD_READY; SendCmdReady(connfd);
CBasicServer::send_data(connfd, &response, sizeof(response));
break; break;
} }
@@ -991,16 +990,14 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
current_channel = CServiceManager::getInstance()->FindChannel(cid); current_channel = CServiceManager::getInstance()->FindChannel(cid);
response.cmd = CZapitMessages::CMD_READY; SendCmdReady(connfd);
CBasicServer::send_data(connfd, &response, sizeof(response));
SendEvent(CZapitClient::EVT_SERVICES_CHANGED); SendEvent(CZapitClient::EVT_SERVICES_CHANGED);
break; break;
} }
case CZapitMessages::CMD_RELOAD_CURRENTSERVICES: { case CZapitMessages::CMD_RELOAD_CURRENTSERVICES: {
#if 0 #if 0
response.cmd = CZapitMessages::CMD_READY; SendCmdReady(connfd);
CBasicServer::send_data(connfd, &response, sizeof(response));
#endif #endif
DBG("[zapit] sending EVT_SERVICES_CHANGED\n"); DBG("[zapit] sending EVT_SERVICES_CHANGED\n");
live_fe->setTsidOnid(0); live_fe->setTsidOnid(0);
@@ -1067,41 +1064,6 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
break; break;
case CZapitMessages::CMD_SCAN_TP: { case CZapitMessages::CMD_SCAN_TP: {
CBasicServer::receive_data(connfd, &TP, sizeof(TP)); CBasicServer::receive_data(connfd, &TP, sizeof(TP));
#if 0
printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams.frequency, TP.feparams.u.qpsk.symbol_rate, TP.feparams.u.qpsk.fec_inner, TP.polarization);
#endif
//FIXME not used ? to scan current channel's TP. manual scan menu updated with current params
if(!(TP.feparams.frequency > 0) && current_channel) {
transponder_list_t::iterator transponder = transponders.find(current_channel->getTransponderId());
TP.feparams.frequency = transponder->second.feparams.frequency;
switch (live_fe->getInfo()->type) {
case FE_QPSK:
case FE_OFDM:
TP.feparams.u.qpsk.symbol_rate = transponder->second.feparams.u.qpsk.symbol_rate;
TP.feparams.u.qpsk.fec_inner = transponder->second.feparams.u.qpsk.fec_inner;
TP.polarization = transponder->second.polarization;
break;
case FE_QAM:
TP.feparams.u.qam.symbol_rate = transponder->second.feparams.u.qam.symbol_rate;
TP.feparams.u.qam.fec_inner = transponder->second.feparams.u.qam.fec_inner;
TP.feparams.u.qam.modulation = transponder->second.feparams.u.qam.modulation;
break;
default:
WARN("Unknown type %d", live_fe->getInfo()->type);
return false;
}
scanProviders.clear();
scanProviders[current_channel->getSatellitePosition()] =
CServiceManager::getInstance()->GetSatelliteName(current_channel->getSatellitePosition());
current_channel = 0;
}
#if 0
PrepareScan();
CServiceScan::getInstance()->Start(CServiceScan::SCAN_TRANSPONDER, (void *) &TP);
#endif
StartScanTP(&TP); StartScanTP(&TP);
break; break;
} }
@@ -1154,13 +1116,13 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
} }
break; break;
} }
#if 0
case CZapitMessages::CMD_SCANSETSCANMOTORPOSLIST: { case CZapitMessages::CMD_SCANSETSCANMOTORPOSLIST: {
// absolute // absolute
ERROR("CZapitMessages::CMD_SCANSETSCANMOTORPOSLIST: depreciated command\n"); ERROR("CZapitMessages::CMD_SCANSETSCANMOTORPOSLIST: depreciated command\n");
break; break;
} }
#endif
case CZapitMessages::CMD_SCANSETDISEQCTYPE: { case CZapitMessages::CMD_SCANSETDISEQCTYPE: {
//FIXME diseqcType is global //FIXME diseqcType is global
#if 0 #if 0
@@ -1184,12 +1146,12 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
case CZapitMessages::CMD_SCANSETBOUQUETMODE: case CZapitMessages::CMD_SCANSETBOUQUETMODE:
CBasicServer::receive_data(connfd, &bouquetMode, sizeof(bouquetMode)); CBasicServer::receive_data(connfd, &bouquetMode, sizeof(bouquetMode));
break; break;
#if 0
case CZapitMessages::CMD_SCANSETTYPE: case CZapitMessages::CMD_SCANSETTYPE:
//CBasicServer::receive_data(connfd, &scanType, sizeof(scanType)); //CBasicServer::receive_data(connfd, &scanType, sizeof(scanType));
ERROR("CZapitMessages::CMD_SCANSETTYPE: depreciated command\n"); ERROR("CZapitMessages::CMD_SCANSETTYPE: depreciated command\n");
break; break;
#endif
case CZapitMessages::CMD_SET_EVENT_MODE: { case CZapitMessages::CMD_SET_EVENT_MODE: {
CZapitMessages::commandSetRecordMode msgSetRecordMode; CZapitMessages::commandSetRecordMode msgSetRecordMode;
CBasicServer::receive_data(connfd, &msgSetRecordMode, sizeof(msgSetRecordMode)); CBasicServer::receive_data(connfd, &msgSetRecordMode, sizeof(msgSetRecordMode));
@@ -1213,14 +1175,10 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
} }
case CZapitMessages::CMD_SB_GET_PLAYBACK_ACTIVE: { case CZapitMessages::CMD_SB_GET_PLAYBACK_ACTIVE: {
/* FIXME check if needed */
CZapitMessages::responseGetPlaybackState msgGetPlaybackState; CZapitMessages::responseGetPlaybackState msgGetPlaybackState;
msgGetPlaybackState.activated = playing; msgGetPlaybackState.activated = playing;
#if 0 //FIXME msgGetPlaybackState.activated = videoDecoder->getPlayState();
if (videoDecoder) {
if (videoDecoder->getPlayState() == VIDEO_PLAYING)
msgGetPlaybackState.activated = 1;
}
#endif
CBasicServer::send_data(connfd, &msgGetPlaybackState, sizeof(msgGetPlaybackState)); CBasicServer::send_data(connfd, &msgGetPlaybackState, sizeof(msgGetPlaybackState));
break; break;
} }
@@ -1260,7 +1218,7 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
CBasicServer::send_data(connfd, &responseInteger, sizeof(responseInteger)); // bouquet & channel number are already starting at 0! CBasicServer::send_data(connfd, &responseInteger, sizeof(responseInteger)); // bouquet & channel number are already starting at 0!
break; break;
} }
#if 0
case CZapitMessages::CMD_BQ_EXISTS_CHANNEL_IN_BOUQUET: { case CZapitMessages::CMD_BQ_EXISTS_CHANNEL_IN_BOUQUET: {
CZapitMessages::commandExistsChannelInBouquet msgExistsChInBq; CZapitMessages::commandExistsChannelInBouquet msgExistsChInBq;
CZapitMessages::responseGeneralTrueFalse responseBool; CZapitMessages::responseGeneralTrueFalse responseBool;
@@ -1269,7 +1227,7 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
CBasicServer::send_data(connfd, &responseBool, sizeof(responseBool)); CBasicServer::send_data(connfd, &responseBool, sizeof(responseBool));
break; break;
} }
#endif
case CZapitMessages::CMD_BQ_MOVE_BOUQUET: { case CZapitMessages::CMD_BQ_MOVE_BOUQUET: {
CZapitMessages::commandMoveBouquet msgMoveBouquet; CZapitMessages::commandMoveBouquet msgMoveBouquet;
CBasicServer::receive_data(connfd, &msgMoveBouquet, sizeof(msgMoveBouquet)); // bouquet & channel number are already starting at 0! CBasicServer::receive_data(connfd, &msgMoveBouquet, sizeof(msgMoveBouquet)); // bouquet & channel number are already starting at 0!
@@ -1305,7 +1263,7 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
#endif #endif
break; break;
} }
#if 0
case CZapitMessages::CMD_BQ_MOVE_CHANNEL: { case CZapitMessages::CMD_BQ_MOVE_CHANNEL: {
CZapitMessages::commandMoveChannel msgMoveChannel; CZapitMessages::commandMoveChannel msgMoveChannel;
CBasicServer::receive_data(connfd, &msgMoveChannel, sizeof(msgMoveChannel)); // bouquet & channel number are already starting at 0! CBasicServer::receive_data(connfd, &msgMoveChannel, sizeof(msgMoveChannel)); // bouquet & channel number are already starting at 0!
@@ -1315,7 +1273,7 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
|| (msgMoveChannel.mode==CZapitClient::MODE_RADIO)) ? 2 : 1); || (msgMoveChannel.mode==CZapitClient::MODE_RADIO)) ? 2 : 1);
break; break;
} }
#endif
case CZapitMessages::CMD_BQ_SET_LOCKSTATE: { case CZapitMessages::CMD_BQ_SET_LOCKSTATE: {
CZapitMessages::commandBouquetState msgBouquetLockState; CZapitMessages::commandBouquetState msgBouquetLockState;
CBasicServer::receive_data(connfd, &msgBouquetLockState, sizeof(msgBouquetLockState)); // bouquet & channel number are already starting at 0! CBasicServer::receive_data(connfd, &msgBouquetLockState, sizeof(msgBouquetLockState)); // bouquet & channel number are already starting at 0!
@@ -1341,8 +1299,7 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
CZapitMessages::commandBoolean msgBoolean; CZapitMessages::commandBoolean msgBoolean;
CBasicServer::receive_data(connfd, &msgBoolean, sizeof(msgBoolean)); CBasicServer::receive_data(connfd, &msgBoolean, sizeof(msgBoolean));
response.cmd = CZapitMessages::CMD_READY; SendCmdReady(connfd);
CBasicServer::send_data(connfd, &response, sizeof(response));
#if 0 #if 0
//if (msgBoolean.truefalse) //if (msgBoolean.truefalse)
if(list_changed) { if(list_changed) {
@@ -1361,19 +1318,20 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
} }
break; break;
} }
#if 0
case CZapitMessages::CMD_SET_VIDEO_SYSTEM: { case CZapitMessages::CMD_SET_VIDEO_SYSTEM: {
CZapitMessages::commandInt msg; CZapitMessages::commandInt msg;
CBasicServer::receive_data(connfd, &msg, sizeof(msg)); CBasicServer::receive_data(connfd, &msg, sizeof(msg));
videoDecoder->SetVideoSystem(msg.val); videoDecoder->SetVideoSystem(msg.val);
break; break;
} }
#endif
#if 0
case CZapitMessages::CMD_SET_NTSC: { case CZapitMessages::CMD_SET_NTSC: {
videoDecoder->SetVideoSystem(8); videoDecoder->SetVideoSystem(8);
break; break;
} }
#endif
case CZapitMessages::CMD_SB_START_PLAYBACK: case CZapitMessages::CMD_SB_START_PLAYBACK:
//playbackStopForced = false; //playbackStopForced = false;
StartPlayBack(current_channel); StartPlayBack(current_channel);
@@ -1381,8 +1339,7 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
case CZapitMessages::CMD_SB_STOP_PLAYBACK: case CZapitMessages::CMD_SB_STOP_PLAYBACK:
StopPlayBack(false); StopPlayBack(false);
response.cmd = CZapitMessages::CMD_READY; SendCmdReady(connfd);
CBasicServer::send_data(connfd, &response, sizeof(response));
break; break;
case CZapitMessages::CMD_SB_LOCK_PLAYBACK: case CZapitMessages::CMD_SB_LOCK_PLAYBACK:
@@ -1391,25 +1348,22 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
StopPlayBack(true); StopPlayBack(true);
standby = false; standby = false;
playbackStopForced = true; playbackStopForced = true;
response.cmd = CZapitMessages::CMD_READY; SendCmdReady(connfd);
CBasicServer::send_data(connfd, &response, sizeof(response));
break; break;
case CZapitMessages::CMD_SB_UNLOCK_PLAYBACK: case CZapitMessages::CMD_SB_UNLOCK_PLAYBACK:
playbackStopForced = false; playbackStopForced = false;
StartPlayBack(current_channel); StartPlayBack(current_channel);
SendPMT(); SendPMT();
response.cmd = CZapitMessages::CMD_READY; SendCmdReady(connfd);
CBasicServer::send_data(connfd, &response, sizeof(response));
break; break;
#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));
#if 0 //FIXME
videoDecoder->setCroppingMode((video_displayformat_t) msg.val); videoDecoder->setCroppingMode((video_displayformat_t) msg.val);
#endif
break; break;
} }
#if 0 #endif
case CZapitMessages::CMD_SET_AUDIO_MODE: { case CZapitMessages::CMD_SET_AUDIO_MODE: {
CZapitMessages::commandInt msg; CZapitMessages::commandInt msg;
CBasicServer::receive_data(connfd, &msg, sizeof(msg)); CBasicServer::receive_data(connfd, &msg, sizeof(msg));
@@ -1417,13 +1371,14 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
audio_mode = msg.val; audio_mode = msg.val;
break; break;
} }
#endif #if 0
case CZapitMessages::CMD_GET_AUDIO_MODE: { case CZapitMessages::CMD_GET_AUDIO_MODE: {
CZapitMessages::commandInt msg; CZapitMessages::commandInt msg;
msg.val = (int) audio_mode; msg.val = (int) audio_mode;
CBasicServer::send_data(connfd, &msg, sizeof(msg)); CBasicServer::send_data(connfd, &msg, sizeof(msg));
break; break;
} }
#endif
case CZapitMessages::CMD_SET_ASPECTRATIO: { case CZapitMessages::CMD_SET_ASPECTRATIO: {
CZapitMessages::commandInt msg; CZapitMessages::commandInt msg;
@@ -1475,7 +1430,7 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
} }
break; break;
} }
#if 0
case CZapitMessages::CMD_GET_FE_SIGNAL: { case CZapitMessages::CMD_GET_FE_SIGNAL: {
CZapitClient::responseFESignal response_FEsig; CZapitClient::responseFESignal response_FEsig;
response_FEsig.sig = live_fe->getSignalStrength(); response_FEsig.sig = live_fe->getSignalStrength();
@@ -1485,7 +1440,7 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
ERROR("CZapitMessages::CMD_GET_FE_SIGNAL: depreciated command\n"); ERROR("CZapitMessages::CMD_GET_FE_SIGNAL: depreciated command\n");
break; break;
} }
#endif
case CZapitMessages::CMD_SETSUBSERVICES: { case CZapitMessages::CMD_SETSUBSERVICES: {
CZapitClient::commandAddSubServices msgAddSubService; CZapitClient::commandAddSubServices msgAddSubService;
@@ -1575,18 +1530,17 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
if (msgBoolean.truefalse) { if (msgBoolean.truefalse) {
// if(currentMode & RECORD_MODE) videoDecoder->freeze(); // if(currentMode & RECORD_MODE) videoDecoder->freeze();
enterStandby(); enterStandby();
response.cmd = CZapitMessages::CMD_READY; SendCmdReady(connfd);
CBasicServer::send_data(connfd, &response, sizeof(response));
} else } else
leaveStandby(); leaveStandby();
break; break;
} }
#if 0
case CZapitMessages::CMD_NVOD_SUBSERVICE_NUM: { case CZapitMessages::CMD_NVOD_SUBSERVICE_NUM: {
CZapitMessages::commandInt msg; CZapitMessages::commandInt msg;
CBasicServer::receive_data(connfd, &msg, sizeof(msg)); CBasicServer::receive_data(connfd, &msg, sizeof(msg));
} }
#endif
case CZapitMessages::CMD_SEND_MOTOR_COMMAND: { case CZapitMessages::CMD_SEND_MOTOR_COMMAND: {
CZapitMessages::commandMotor msgMotor; CZapitMessages::commandMotor msgMotor;
CBasicServer::receive_data(connfd, &msgMotor, sizeof(msgMotor)); CBasicServer::receive_data(connfd, &msgMotor, sizeof(msgMotor));