blank the device completely by svdrp off

4 files changed, 8 insertions, 8 deletions

diff --git a/targavfd.c b/targavfd.c
index 230de51..9a0de26 100644
--- a/targavfd.c
+++ b/targavfd.c
@@ -109,7 +109,7 @@ bool cPluginTargaVFD::resume() {
 
 bool cPluginTargaVFD::suspend() {
   if(!m_bSuspend) {
-    m_dev.close();
+    m_dev.shutdown(eOnExitMode_BLANKSCREEN);
     m_bSuspend = true;
     return true;
   }
@@ -134,7 +134,7 @@ void cPluginTargaVFD::Stop(void)
     delete statusMonitor;
     statusMonitor = NULL;
   }
-  m_dev.close();
+  m_dev.shutdown(theSetup.m_nOnExit);
 }
 
 void cPluginTargaVFD::Housekeeping(void)
diff --git a/vfd.h b/vfd.h
index bb2973b..c572b89 100644
--- a/vfd.h
+++ b/vfd.h
@@ -55,6 +55,7 @@ class cVFDQueue : public std::queue<byte> {
 public:
   cVFDQueue();
   virtual ~cVFDQueue();
+protected:
   virtual bool open();
   virtual void close();
   virtual bool isopen() const { return hid != 0; }
@@ -84,7 +85,7 @@ public:
   virtual ~cVFD();
 
   virtual bool open();
-  virtual void close ();
+  virtual void close();
 
 
   void clear ();
diff --git a/watch.c b/watch.c
index 4a102a1..05fb60e 100644
--- a/watch.c
+++ b/watch.c
@@ -75,7 +75,6 @@ cVFDWatch::cVFDWatch()
 
 cVFDWatch::~cVFDWatch()
 {
-  close();
   if(chName) { 
     delete chName;
     chName = NULL;
@@ -128,7 +127,7 @@ bool cVFDWatch::open() {
   return false;
 }
 
-void cVFDWatch::close() {
+void cVFDWatch::shutdown(int nExitMode) {
 
   if(Running()) {
     m_bShutdown = true;
@@ -139,7 +138,7 @@ void cVFDWatch::close() {
   if(this->isopen()) {
     cTimer* t = Timers.GetNextActiveTimer();    
 
-    switch(theSetup.m_nOnExit) {
+    switch(nExitMode) {
       case eOnExitMode_NEXTTIMER:
       case eOnExitMode_NEXTTIMER_BLANKSCR: {
         isyslog("targaVFD: closing, show only next timer.");
@@ -173,7 +172,7 @@ void cVFDWatch::close() {
           }
           this->icons(eIconRECORD);
         } else {
-          if(theSetup.m_nOnExit == eOnExitMode_NEXTTIMER) 
+          if(nExitMode == eOnExitMode_NEXTTIMER) 
             this->DrawText(0,nTop<0?0:nTop,tr("None active timer"));
           this->icons(0);
         }
diff --git a/watch.h b/watch.h
index 6151362..cbe4021 100644
--- a/watch.h
+++ b/watch.h
@@ -110,7 +110,7 @@ public:
   virtual ~cVFDWatch();
 
   virtual bool open();
-  virtual void close ();
+  virtual void shutdown(int nExitMode);
 
   void Replaying(const cControl *pControl, const char *szName, const char *szFileName, bool bOn);
   void Recording(const cDevice *pDevice, const char *szName, const char *szFileName, bool bOn);