From c3a6d8ffbb27f4006fde2d20178b7bf8532fbd9f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 24 Feb 2016 13:41:45 +0100 Subject: [PATCH] controlapi/logolist: use well-known tags for channelid's Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f7fefac50817682a60c8ff3b5dea34edc3f6c77d Author: vanhofen Date: 2016-02-24 (Wed, 24 Feb 2016) Origin message was: ------------------ - controlapi/logolist: use well-known tags for channelid's ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/nhttpd/tuxboxapi/controlapi.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index fff1f19af..68a839ef9 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -936,8 +936,8 @@ void CControlAPI::LogolistCGI(CyhookHandler *hh) { item = hh->outPair("name", hh->outValue(channel->getName()), true); - id = hh->outPair("short", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID() & 0xFFFFFFFFFFFFULL), true); - id += hh->outPair("long", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID()), false); + id = hh->outPair("id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID()), true); + id += hh->outPair("short_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID() & 0xFFFFFFFFFFFFULL), false); item += hh->outObject("id", id, files); if (files)