Return all channels for channel list, remove unnecessary data

diff --git a/handler.c b/handler.c
index d655e2df99d7fa7b6a06d47ce0339d549c34fd93..207880588eb4b6fb41b3d2028a409b6d8f7f6e4c 100644 (file)
--- 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);    
     }
   }