diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp index 109b00114..dfc1c5118 100644 --- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp @@ -427,21 +427,15 @@ void CControlAPI::StandbyCGI(CyhookHandler *hh) { if (hh->ParamList["1"] == "on") // standby mode on { - if(CNeutrinoApp::getInstance()->getMode() == 4){ - hh->WriteLn("standby is already on"); - }else { + if(CNeutrinoApp::getInstance()->getMode() != 4) NeutrinoAPI->EventServer->sendEvent(NeutrinoMessages::STANDBY_ON, CEventServer::INITID_HTTPD); - hh->SendOk(); - } + hh->SendOk(); } else if (hh->ParamList["1"] == "off")// standby mode off { - if(CNeutrinoApp::getInstance()->getMode() != 4){ - hh->WriteLn("standby is already off"); - }else { + if(CNeutrinoApp::getInstance()->getMode() == 4) NeutrinoAPI->EventServer->sendEvent(NeutrinoMessages::STANDBY_OFF, CEventServer::INITID_HTTPD); - hh->SendOk(); - } + hh->SendOk(); } else hh->SendError(); @@ -459,21 +453,13 @@ void CControlAPI::RCCGI(CyhookHandler *hh) if (!(hh->ParamList.empty())) { if (hh->ParamList["1"] == "lock"){ // lock remote control - if(!CRCLock::locked){ + if(!CRCLock::locked) NeutrinoAPI->EventServer->sendEvent(NeutrinoMessages::LOCK_RC, CEventServer::INITID_HTTPD); - }else{ - hh->WriteLn("remote is already locked"); - return; - } } else if (hh->ParamList["1"] == "unlock"){// unlock remote control - if(CRCLock::locked){ + if(CRCLock::locked) NeutrinoAPI->EventServer->sendEvent(NeutrinoMessages::UNLOCK_RC, CEventServer::INITID_HTTPD); - }else{ - hh->WriteLn("remote is already unlocked"); - return; - } } else{ hh->SendError(); @@ -1496,25 +1482,20 @@ void CControlAPI::ZaptoCGI(CyhookHandler *hh) SendAllCurrentVAPid(hh); else if (hh->ParamList["1"] == "stopplayback") { - if(!NeutrinoAPI->Zapit->isPlayBackActive()){ - hh->WriteLn("playback is already off"); - }else{ + if(NeutrinoAPI->Zapit->isPlayBackActive()){ NeutrinoAPI->Zapit->stopPlayBack(); NeutrinoAPI->Sectionsd->setPauseScanning(true); - hh->SendOk(); } + hh->SendOk(); } else if (hh->ParamList["1"] == "startplayback") { - if(NeutrinoAPI->Zapit->isPlayBackActive()){ - hh->WriteLn("playback is already on"); - }else{ + if(!NeutrinoAPI->Zapit->isPlayBackActive()){ NeutrinoAPI->Zapit->startPlayBack(); NeutrinoAPI->Sectionsd->setPauseScanning(false); dprintf("start playback requested..\n"); - hh->SendOk(); } - + hh->SendOk(); } else if (hh->ParamList["1"] == "statusplayback") hh->Write((char *) (NeutrinoAPI->Zapit->isPlayBackActive() ? "1" : "0"));