From c7af7992e97f1f5b2264a90d682fa067adde0bb9 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Wed, 25 Apr 2012 15:32:04 +0400 Subject: [PATCH] zapit/src/frontend.cpp: comment getInstance, currentFe Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/6acb22231160bb6bafdb98dfe504982defac56d6 Author: [CST] Focus Date: 2012-04-25 (Wed, 25 Apr 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/zapit/include/zapit/frontend_c.h | 4 ++-- src/zapit/src/frontend.cpp | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/zapit/include/zapit/frontend_c.h b/src/zapit/include/zapit/frontend_c.h index 64d909c7c..ec89fb384 100644 --- a/src/zapit/include/zapit/frontend_c.h +++ b/src/zapit/include/zapit/frontend_c.h @@ -100,7 +100,7 @@ class CFrontend /* current adapter where this frontend is on */ int adapter; /* current frontend instance */ - static CFrontend *currentFe; + //static CFrontend *currentFe; bool locked; /* tuning finished flag */ bool tuned; @@ -159,7 +159,7 @@ class CFrontend /* Private constructor */ CFrontend(int Number = 0, int Adapter = 0); - static CFrontend *getInstance(int Number = 0, int Adapter = 0); + //static CFrontend *getInstance(int Number = 0, int Adapter = 0); friend class CFEManager; public: ~CFrontend(void); diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index bee4b23cd..7e8f298e7 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -137,6 +137,7 @@ typedef enum dvb_fec { #define TIME_STEP 200 #define TIMEOUT_MAX_MS (feTimeout*100) /*********************************************************************************************************/ +#if 0 // Global fe instance CFrontend *CFrontend::currentFe = NULL; @@ -148,7 +149,7 @@ CFrontend *CFrontend::getInstance(int Number, int Adapter) } return currentFe; } - +#endif CFrontend::CFrontend(int Number, int Adapter) { printf("[fe%d] New frontend on adapter %d\n", Number, Adapter); @@ -239,6 +240,8 @@ void CFrontend::Close(void) if(standby) return; + printf("[fe%d] close frontend\n", fenumber); + if (!slave && config.diseqcType > MINI_DISEQC) sendDiseqcStandby();