Fix text corruption on channel list when returning from live TV

Remove Input::NA_SIGNAL

diff --git a/control.cc b/control.cc
index 8666cf368a02cad57f8c48a8485383436b868fa8..bfd761f4ebb7d3d8f1c193a69c4446b7ad081389 100644 (file)
--- a/control.cc
+++ b/control.cc
@@ -399,14 +399,11 @@ void Control::run()
   }
   else
   {
-    VConnect* vconnect = new VConnect(); // FIXME never deleted?
+    VConnect* vconnect = new VConnect(); // Deleted when VConnect messages Control, and is boxstack->remove()'d
     boxstack->add(vconnect);
     vconnect->run();
   }
 
-
-  // FIXME Input::NA_SIGNAL is possibly obsolete now
-
   std::unique_lock<std::mutex> lockWrapper(messageQueueMutex);  // locks. unlocks on out-of-scope
 
   inputMan->start();

diff --git a/input.h b/input.h
index a88501d5a0f246a5e9f73cc8bbd5ade38863ed23..5b53613ec961b480625fec34152d5ceb05253809 100644 (file)
--- a/input.h
+++ b/input.h
@@ -77,7 +77,6 @@ class Input: public AbstractOption
     const static UCHAR NA_LEARN    = 101;
     const static UCHAR NA_NONE     = 98;
     const static UCHAR NA_UNKNOWN  = 99;
-    const static UCHAR NA_SIGNAL   = 100;
 
     // Problem common buttons
     const static UCHAR VOLUMEUP    = 16;

diff --git a/inputlinux.cc b/inputlinux.cc
index 67c9d0f39dc16d48112eed1034b4613e3d945bbf..9a81fb8b08d50cac5bc63f64ff43a91703a6bfa2 100644 (file)
--- a/inputlinux.cc
+++ b/inputlinux.cc
@@ -612,5 +612,3 @@ void InputLinux::listenLoop()
   close(pfds[1]);
   close(pfds[0]);
 }
-
-// FIXME surely NA_SIGNAL can go

diff --git a/inputwin.cc b/inputwin.cc
index ea8fb78b9c958b9d3dbba6fb5a308b2d260a8d98..7646f764b4f85d02acda886f41e9615031bd6d6f 100644 (file)
--- a/inputwin.cc
+++ b/inputwin.cc
@@ -88,7 +88,7 @@ UCHAR RemoteWin::getButtonPress(int waitType)
   if (!hascurevent) {
          if (signal) {
                  signal=false;
-                 return NA_SIGNAL; //Since we have no signals on windows, we simulate this
+                 //return NA_SIGNAL; //Since we have no signals on windows, we simulate this
          } else {
                  return NA_NONE;
          }

diff --git a/vchannellist.cc b/vchannellist.cc
index 8067efd8c4ebafed5bf5ff1567d634f387ebf540..c34bf06aeb70acde4b2f596a85c6a1d8f16e3d38 100644 (file)
--- a/vchannellist.cc
+++ b/vchannellist.cc
@@ -165,12 +165,22 @@ void VChannelList::doShowingBar()
   int topOption = sl.getTopOption() + 1;
   if (sl.getNumOptions() == 0) topOption = 0;
 
+  rectangle(220, 385, 160, 25, DrawStyle::VIEWBACKGROUND);
+
   char showing[200];
   sprintf(showing, tr("%i to %i of %i"), topOption, sl.getBottomOption(), sl.getNumOptions());
-#ifndef GRADIENT_DRAWING
-  rectangle(220, 385,160, 25, DrawStyle::VIEWBACKGROUND);
-#endif
   drawText(showing, 220, 385, DrawStyle::LIGHTTEXT);
+
+  /*
+   * The following would work but the translation files need changing to {} instead of %i
+   * This is server side and so requires a server version bump breaking compatibility with older clients
+   * Maybe this will happen for v0.6 ?
+   *
+   * drawText(
+   * fmt::format(tr("%i to %i of %i"), topOption, sl.getBottomOption(), sl.getNumOptions()).c_str(),
+   * 220, 385, DrawStyle::LIGHTTEXT);
+   *
+   */
 }
 
 void VChannelList::quickUpdate() { //only quick for plattform that need it!