From 2330a0736808256f344e2f5729ffe9a93deaf0a6 Mon Sep 17 00:00:00 2001 From: Chris Tallon Date: Sun, 28 Apr 2013 18:21:01 +0100 Subject: [PATCH] Return all channels for channel list, remove unnecessary data --- handler.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/handler.c b/handler.c index d655e2d..2078805 100644 --- a/handler.c +++ b/handler.c @@ -588,21 +588,21 @@ bool jsonserver_channellist(Json::Value& js) { if (!channel->GroupSep()) { - log->log("JSONServer", Log::DEBUG, "name: '%s'", channel->Name()); +// log->log("JSONServer", Log::DEBUG, "name: '%s'", channel->Name()); - if (channel->Vpid()) type = 1; - else if (channel->Apid(0)) type = 2; - else continue; +// if (channel->Vpid()) type = 1; +// else if (channel->Apid(0)) type = 2; +// else continue; Json::Value oneChannel; oneChannel["Number"] = channel->Number(); - oneChannel["Type"] = type; +// oneChannel["Type"] = type; oneChannel["Name"] = channel->Name(); -#if VDRVERSNUM < 10703 - oneChannel["VType"] = 2; -#else - oneChannel["VType"] = channel->Vtype(); -#endif +//#if VDRVERSNUM < 10703 +// oneChannel["VType"] = 2; +//#else +// oneChannel["VType"] = channel->Vtype(); +//#endif jschannels.append(oneChannel); } } -- 2.39.5