From b64ad0029d5276e22f175b7e8cd9cceb82fb877a Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Thu, 14 Jan 2016 12:58:45 +0100 Subject: [PATCH] CFEManager: Set dummy name for dummy test frontend Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/f6d5a2826d62de3e25708f8f93965a756a724d66 Author: Michael Liebmann Date: 2016-01-14 (Thu, 14 Jan 2016) --- src/zapit/include/zapit/frontend_c.h | 1 + src/zapit/src/femanager.cpp | 1 + src/zapit/src/frontend.cpp | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/src/zapit/include/zapit/frontend_c.h b/src/zapit/include/zapit/frontend_c.h index ce8fbc389..c513ced15 100644 --- a/src/zapit/include/zapit/frontend_c.h +++ b/src/zapit/include/zapit/frontend_c.h @@ -301,6 +301,7 @@ class CFrontend static fe_delivery_system_t getFEDeliverySystem(delivery_system_t Delsys); static uint32_t getFEBandwidth(fe_bandwidth_t bandwidth); const char* getName(void) const { return info.name; } + void setName(const char* _name); private: // DEPRECATED fe_type_t getType() { return info.type; } diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp index 2f49b2485..590023cf6 100644 --- a/src/zapit/src/femanager.cpp +++ b/src/zapit/src/femanager.cpp @@ -118,6 +118,7 @@ bool CFEManager::Init() if (femap.empty() && getenv("SIMULATE_FE")) { INFO("SIMULATE_FE is set, adding dummy frontend for testing"); fe = new CFrontend(0,0); + fe->setName("DuTu - The dummy tuner"); fekey = MAKE_FE_KEY(0, 0); femap.insert(std::pair (fekey, fe)); livefe = fe; diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index 543959a73..9c6fee4aa 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -1073,6 +1073,12 @@ uint32_t CFrontend::getFEBandwidth(fe_bandwidth_t bandwidth) return bandwidth_hz; } +void CFrontend::setName(const char* _name) +{ + memset(info.name, '\0', sizeof(info.name)); + snprintf(info.name, sizeof(info.name)-1, "%s", _name); +} + bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_properties& cmdseq) { fe_pilot_t pilot = PILOT_OFF;