Display server names

diff --git a/vdr.h b/vdr.h
index d63b1f5c69ef364003526b242779e67e14330579..9111d2c2cdd5ce15c33f99540500793bc8abcfa9 100644 (file)
--- a/vdr.h
+++ b/vdr.h
@@ -63,7 +63,6 @@ struct ServerSorter
 {
   bool operator() (const VDRServer a, const VDRServer b)
   {
-    printf("%s %s\n", a.name, b.name);
     if (strcmp(b.name, a.name) > 0) return true;
     return false;
   }

diff --git a/vserverselect.cc b/vserverselect.cc
index 4718f60d7f065750a56b72aaab988742c8f70a3f..f6bfb5cb9dd340ab332e70cf22a897b238ceda44 100644 (file)
--- a/vserverselect.cc
+++ b/vserverselect.cc
@@ -20,7 +20,7 @@
 
 #include "vserverselect.h"
 
-VServerSelect::VServerSelect(std::vector<char*>* serverIPs, void* treplyTo)
+VServerSelect::VServerSelect(vector<VDRServer>& servers, void* treplyTo)
 {
   // I tried the whole passing using a reference here, but
   // the program segfaulted when settitletext tried to new
@@ -46,10 +46,10 @@ VServerSelect::VServerSelect(std::vector<char*>* serverIPs, void* treplyTo)
   sl.setSurfaceOffset(10, 30 + 5);
   sl.setDimensions(area.w - 20, area.h - 30 - 15);
 
-  sl.addOption((*serverIPs)[0], 1);
-  for(UINT k = 1; k < serverIPs->size(); k++)
+  sl.addOption(servers[0].name, 1);
+  for(UINT k = 1; k < servers.size(); k++)
   {
-    sl.addOption((*serverIPs)[k], 0);
+    sl.addOption(servers[k].name, 0);
   }
 
   replyTo = treplyTo;

diff --git a/vserverselect.h b/vserverselect.h
index c01c144ed7bdb34ce820b1be0f6d35f7b615f592..2af588d081d31d53eedbb81762d111175ed15617 100644 (file)
--- a/vserverselect.h
+++ b/vserverselect.h
@@ -33,11 +33,14 @@
 #include "video.h"
 #include "viewman.h"
 #include "i18n.h"
+#include "vdr.h"
+
+using namespace std;
 
 class VServerSelect : public View
 {
   public:
-    VServerSelect(std::vector<char*>* tserverIPs, void* replyTo);
+    VServerSelect(vector<VDRServer>& servers, void* replyTo);
     ~VServerSelect();
 
     int handleCommand(int command);