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

neutrino: unify modes handling; ...

Browse Source 
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 028ec3cf3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-20 15:19:06 +01:00
parent 70493435d5
commit 476ce63d99
28 changed files with 233 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -390,8 +390,8 @@ void CControlAPI::SetModeCGI(CyhookHandler *hh)
if (hh->ParamList["1"] == "radio") // switch to radio mode
{
if(CNeutrinoApp::getInstance()->getMode() != NeutrinoMessages::mode_standby){
neutrino_msg_data_t mode = NeutrinoMessages::mode_radio;
if(CNeutrinoApp::getInstance()->getMode() != NeutrinoModes::mode_standby){
neutrino_msg_data_t mode = NeutrinoModes::mode_radio;
NeutrinoAPI->EventServer->sendEvent(NeutrinoMessages::CHANGEMODE, CEventServer::INITID_HTTPD, (void *)&mode,sizeof(neutrino_msg_data_t));
sleep(1);
NeutrinoAPI->UpdateBouquets();
@@ -402,8 +402,8 @@ void CControlAPI::SetModeCGI(CyhookHandler *hh)
}
else if (hh->ParamList["1"] == "tv") // switch to tv mode
{
if(CNeutrinoApp::getInstance()->getMode() != NeutrinoMessages::mode_standby){
neutrino_msg_data_t mode = NeutrinoMessages::mode_tv;
if(CNeutrinoApp::getInstance()->getMode() != NeutrinoModes::mode_standby){
neutrino_msg_data_t mode = NeutrinoModes::mode_tv;
NeutrinoAPI->EventServer->sendEvent(NeutrinoMessages::CHANGEMODE, CEventServer::INITID_HTTPD, (void *)&mode,sizeof(neutrino_msg_data_t));
sleep(1);
NeutrinoAPI->UpdateBouquets();
@@ -463,23 +463,23 @@ void CControlAPI::GetModeCGI(CyhookHandler *hh)
else
{
int mode = CNeutrinoApp::getInstance()->getMode();
if (mode == NeutrinoMessages::mode_tv)
if (mode == NeutrinoModes::mode_tv)
result = "tv";
else if (mode == NeutrinoMessages::mode_radio)
else if (mode == NeutrinoModes::mode_radio)
result = "radio";
else if (mode == NeutrinoMessages::mode_scart)
else if (mode == NeutrinoModes::mode_scart)
result = "scart";
else if (mode == NeutrinoMessages::mode_standby)
else if (mode == NeutrinoModes::mode_standby)
result = "standby";
else if (mode == NeutrinoMessages::mode_audio)
else if (mode == NeutrinoModes::mode_audio)
result = "audio";
else if (mode == NeutrinoMessages::mode_pic)
else if (mode == NeutrinoModes::mode_pic)
result = "pic";
else if (mode == NeutrinoMessages::mode_ts)
else if (mode == NeutrinoModes::mode_ts)
result = "ts";
else if (mode == NeutrinoMessages::mode_webtv)
else if (mode == NeutrinoModes::mode_webtv)
result = "webtv";
else if (mode == NeutrinoMessages::mode_upnp)
else if (mode == NeutrinoModes::mode_upnp)
result = "upnp";
else
result = "unknown";