From 5a6a80fc74fbd2328f91229a9f86c35eb78159c4 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Fri, 12 Jan 2018 14:49:02 +0100 Subject: [PATCH] align bouquet names to delivery system (C/T/E/W) Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/f153f3e9b2d53e8fed5101daba95dfe9b51b814e Author: TangoCash Date: 2018-01-12 (Fri, 12 Jan 2018) --- src/zapit/src/scansdt.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/zapit/src/scansdt.cpp b/src/zapit/src/scansdt.cpp index 9114a0eea..94f144835 100644 --- a/src/zapit/src/scansdt.cpp +++ b/src/zapit/src/scansdt.cpp @@ -417,11 +417,15 @@ bool CSdt::AddToBouquet(std::string &providerName, CZapitChannel *channel) case ST_NVOD_TIME_SHIFTED_SERVICE: { char pname[100]; - if (!cable) - snprintf(pname, 100, "[%c%03d.%d] %s", satellitePosition > 0? 'E' : 'W', + if SAT_POSITION_CABLE(satellitePosition) + snprintf(pname, 100, "[C%03d.%d] %s", + abs((int)satellitePosition)/10, abs((int)satellitePosition)%10, providerName.c_str()); + else if SAT_POSITION_TERR(satellitePosition) + snprintf(pname, 100, "[T%03d.%d] %s", abs((int)satellitePosition)/10, abs((int)satellitePosition)%10, providerName.c_str()); else - snprintf(pname, 100, "%s", providerName.c_str()); + snprintf(pname, 100, "[%c%03d.%d] %s", satellitePosition > 0? 'E' : 'W', + abs((int)satellitePosition)/10, abs((int)satellitePosition)%10, providerName.c_str()); int bouquetId = scanBouquetManager->existsBouquet(pname); CZapitBouquet* bouquet;