From c5aa1f78e922dd4fb8f7e9e1359b50511effcbde Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 13 Apr 2013 22:53:38 +0200 Subject: [PATCH] getservices: add option to not save removed channels Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b577322a79fb55bd8452fb79b2a6e2c37892639d Author: Stefan Seyfried Date: 2013-04-13 (Sat, 13 Apr 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/zapit/include/zapit/getservices.h | 2 +- src/zapit/src/getservices.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/zapit/include/zapit/getservices.h b/src/zapit/include/zapit/getservices.h index 56c577f98..2dc1cd0dc 100644 --- a/src/zapit/include/zapit/getservices.h +++ b/src/zapit/include/zapit/getservices.h @@ -112,7 +112,7 @@ class CServiceManager bool InitSatPosition(t_satellite_position position, char * name = NULL, bool force = false, int deltype = FE_QPSK); bool LoadServices(bool only_current); - void SaveServices(bool tocopy, bool if_changed = false); + void SaveServices(bool tocopy, bool if_changed = false, bool no_deleted = false); void SaveMotorPositions(); bool SaveCurrentServices(transponder_id_t tpid); bool CopyCurrentServices(transponder_id_t tpid); diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp index 72fdd2947..c1137fa68 100644 --- a/src/zapit/src/getservices.cpp +++ b/src/zapit/src/getservices.cpp @@ -785,7 +785,7 @@ void CServiceManager::WriteSatHeader(FILE * fd, sat_config_t &config) } } -void CServiceManager::SaveServices(bool tocopy, bool if_changed) +void CServiceManager::SaveServices(bool tocopy, bool if_changed, bool no_deleted) { int processed = 0; @@ -830,7 +830,9 @@ void CServiceManager::SaveServices(bool tocopy, bool if_changed) tpdone = 1; } - ccI->second.dumpServiceXml(fd); + /* don't dump removed channels if no_deleted == true */ + if (!no_deleted || !(ccI->second.flags & CZapitChannel::REMOVED)) + ccI->second.dumpServiceXml(fd); processed++; #ifdef SAVE_DEBUG chans_processed.insert(ccI->second.getChannelID());