controlapi/getmode: get right mode; allow json/xml output

Origin commit data
------------------
Branch: ni/coolstream
Commit: 10252bd09c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-21 (Sun, 21 Feb 2016)

Origin message was:
------------------
- controlapi/getmode: get right mode; allow json/xml output

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-02-21 21:41:26 +01:00
parent f327572416
commit dbb4706326

View File

@@ -385,13 +385,37 @@ void CControlAPI::SetModeCGI(CyhookHandler *hh)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CControlAPI::GetModeCGI(CyhookHandler *hh) void CControlAPI::GetModeCGI(CyhookHandler *hh)
{ {
int mode = NeutrinoAPI->Zapit->getMode(); hh->outStart();
if ( mode == CZapitClient::MODE_TV)
hh->WriteLn("tv"); std::string result = "";
else if ( mode == CZapitClient::MODE_RADIO) int mode = CNeutrinoApp::getInstance()->getMode();
return hh->WriteLn("radio"); if (mode == NeutrinoMessages::mode_tv)
result = "tv";
else if (mode == NeutrinoMessages::mode_radio)
result = "radio";
else if (mode == NeutrinoMessages::mode_scart)
result = "scart";
else if (mode == NeutrinoMessages::mode_standby)
result = "standby";
else if (mode == NeutrinoMessages::mode_audio)
result = "audio";
else if (mode == NeutrinoMessages::mode_pic)
result = "pic";
else if (mode == NeutrinoMessages::mode_ts)
result = "ts";
else if (mode == NeutrinoMessages::mode_webtv)
result = "webtv";
else if (mode == NeutrinoMessages::mode_upnp)
result = "upnp";
else else
return hh->WriteLn("unknown"); result = "unknown";
if (hh->getOutType() != plain)
{
result = hh->outPair("mode", result, false);
result = hh->outCollection("getmode", result);
}
hh->SendResult(result);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------