/*
- 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
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <boost/lexical_cast.hpp>
#include "servers_list_dialog.h"
#include "wx_util.h"
+#include "lib/encode_server_finder.h"
+#include "lib/encode_server_description.h"
+#include <boost/lexical_cast.hpp>
using std::list;
using std::string;
{
wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
SetSizer (s);
-
- _list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (400, 200), wxLC_REPORT | wxLC_SINGLE_SEL);
+
+ _list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (500, 200), wxLC_REPORT | wxLC_SINGLE_SEL);
{
wxListItem ip;
wxListItem ip;
ip.SetId (1);
ip.SetText (_("Threads"));
- ip.SetWidth (100);
+ ip.SetWidth (150);
_list->InsertColumn (1, ip);
}
SetSizer (s);
s->Layout ();
s->SetSizeHints (this);
-
- _server_finder.ServerFound.connect (boost::bind (&ServersListDialog::server_found, this, _1));
+
+ _server_finder_connection = EncodeServerFinder::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;
+ _list->DeleteAllItems ();
+
+ int n = 0;
+
+ for (auto i: EncodeServerFinder::instance()->servers()) {
+ wxListItem list_item;
+ list_item.SetId (n);
+ _list->InsertItem (list_item);
+
+ _list->SetItem (n, 0, std_to_wx (i.host_name ()));
+ if (i.current_link_version()) {
+ _list->SetItem (n, 1, std_to_wx (lexical_cast<string> (i.threads ())));
+ } else {
+ _list->SetItem (n, 1, _("Incorrect version"));
+ }
+ ++n;
}
-
- if (i != _servers.end ()) {
- return;
- }
-
- wxListItem list_item;
- int const n = _list->GetItemCount ();
- 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 ())));
-
- _servers.push_back (s);
}