Move ServerDescription into its own header.

[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 49d91fca404be51ab9a3aa1ba7c56155c9d3b593..0c46b1ecf6731688e4947963b27d0c1bbbf9eeb7 100644 (file)
--- a/src/wx/servers_list_dialog.cc
+++ b/src/wx/servers_list_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +17,12 @@
 
 */
 
-#include <boost/lexical_cast.hpp>
 #include "servers_list_dialog.h"
 #include "wx_util.h"
+#include "lib/server_finder.h"
+#include "lib/server_description.h"
+#include <boost/lexical_cast.hpp>
+#include <boost/foreach.hpp>
 
 using std::list;
 using std::string;
@@ -30,7 +33,7 @@ ServersListDialog::ServersListDialog (wxWindow* parent)
 {
        wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
        SetSizer (s);
-       
+
        _list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (400, 200), wxLC_REPORT | wxLC_SINGLE_SEL);
 
        {
@@ -59,29 +62,25 @@ ServersListDialog::ServersListDialog (wxWindow* parent)
        SetSizer (s);
        s->Layout ();
        s->SetSizeHints (this);
-       
-       _server_finder.ServerFound.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 ()
 {
-       list<ServerDescription>::const_iterator i = _servers.begin();
-       while (i != _servers.end() && i->host_name() != s.host_name()) {
-               ++i;
-       }
-
-       if (i != _servers.end ()) {
-               return;
-       }
+       _list->DeleteAllItems ();
 
-       wxListItem list_item;
-       int const n = _list->GetItemCount ();
-       list_item.SetId (n);
-       _list->InsertItem (list_item);
+       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;
+       }
 }