Better updating of servers list when things change.

[dcpomatic.git] / src / wx / servers_list_dialog.cc

diff --git a/src/wx/servers_list_dialog.cc b/src/wx/servers_list_dialog.cc
index 13c6df70729746ba40d7556e14fa2e5d8fdd3c5f..b678da073d498f0e55ebc006fa89dfda85116b28 100644 (file)
--- a/src/wx/servers_list_dialog.cc
+++ b/src/wx/servers_list_dialog.cc
@@ -17,10 +17,11 @@
 
 */
 
-#include <boost/lexical_cast.hpp>
-#include "lib/server_finder.h"
 #include "servers_list_dialog.h"
 #include "wx_util.h"
+#include "lib/server_finder.h"
+#include <boost/lexical_cast.hpp>
+#include <boost/foreach.hpp>
 
 using std::list;
 using std::string;
@@ -61,19 +62,24 @@ ServersListDialog::ServersListDialog (wxWindow* parent)
        s->Layout ();
        s->SetSizeHints (this);
 
-       _server_finder_connection = ServerFinder::instance()->connect (boost::bind (&ServersListDialog::server_found, this, _1));
+       _server_finder_connection = ServerFinder::instance()->ServersListChanged.connect (boost::bind (&ServersListDialog::servers_list_changed, this));
+       servers_list_changed ();
 }
 
 void
-ServersListDialog::server_found (ServerDescription s)
+ServersListDialog::servers_list_changed ()
 {
-       wxListItem list_item;
-       int const n = _list->GetItemCount ();
-       list_item.SetId (n);
-       _list->InsertItem (list_item);
+       _list->DeleteAllItems ();
+
+       int n = 0;
+       BOOST_FOREACH (ServerDescription i, ServerFinder::instance()->servers ()) {
+               wxListItem list_item;
+               list_item.SetId (n);
+               _list->InsertItem (list_item);
 
-       _list->SetItem (n, 0, std_to_wx (s.host_name ()));
-       _list->SetItem (n, 1, std_to_wx (lexical_cast<string> (s.threads ())));
+               _list->SetItem (n, 0, std_to_wx (i.host_name ()));
+               _list->SetItem (n, 1, std_to_wx (lexical_cast<string> (i.threads ())));
 
-       _servers.push_back (s);
+               ++n;
+       }
 }