projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[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..13c6df70729746ba40d7556e14fa2e5d8fdd3c5f 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
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
@@
-18,6
+18,7
@@
*/
#include <boost/lexical_cast.hpp>
*/
#include <boost/lexical_cast.hpp>
+#include "lib/server_finder.h"
#include "servers_list_dialog.h"
#include "wx_util.h"
#include "servers_list_dialog.h"
#include "wx_util.h"
@@
-30,7
+31,7
@@
ServersListDialog::ServersListDialog (wxWindow* parent)
{
wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
SetSizer (s);
{
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 (400, 200), wxLC_REPORT | wxLC_SINGLE_SEL);
{
@@
-59,22
+60,13
@@
ServersListDialog::ServersListDialog (wxWindow* parent)
SetSizer (s);
s->Layout ();
s->SetSizeHints (this);
SetSizer (s);
s->Layout ();
s->SetSizeHints (this);
-
- _server_finder
.ServerFound.
connect (boost::bind (&ServersListDialog::server_found, this, _1));
+
+ _server_finder
_connection = ServerFinder::instance()->
connect (boost::bind (&ServersListDialog::server_found, this, _1));
}
void
ServersListDialog::server_found (ServerDescription s)
{
}
void
ServersListDialog::server_found (ServerDescription s)
{
- list<ServerDescription>::const_iterator i = _servers.begin();
- while (i != _servers.end() && i->host_name() != s.host_name()) {
- ++i;
- }
-
- if (i != _servers.end ()) {
- return;
- }
-
wxListItem list_item;
int const n = _list->GetItemCount ();
list_item.SetId (n);
wxListItem list_item;
int const n = _list->GetItemCount ();
list_item.SetId (n);