projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash in verification due to mismatched wxString::Format placeholder.
[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 299ce2f20aee0c2e339515a7049655994afca96c..37a14338431f3f44dea91f44314aa2ef55d2edf6 100644
(file)
--- a/
src/wx/servers_list_dialog.cc
+++ b/
src/wx/servers_list_dialog.cc
@@
-1,26
+1,29
@@
/*
Copyright (C) 2013-2015 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.
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
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 "lib/server_finder.h"
#include "servers_list_dialog.h"
#include "wx_util.h"
#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>
+#include <boost/foreach.hpp>
using std::list;
using std::string;
using std::list;
using std::string;
@@
-31,8
+34,8
@@
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 (
4
00, 200), wxLC_REPORT | wxLC_SINGLE_SEL);
+
+ _list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (
5
00, 200), wxLC_REPORT | wxLC_SINGLE_SEL);
{
wxListItem ip;
{
wxListItem ip;
@@
-46,7
+49,7
@@
ServersListDialog::ServersListDialog (wxWindow* parent)
wxListItem ip;
ip.SetId (1);
ip.SetText (_("Threads"));
wxListItem ip;
ip.SetId (1);
ip.SetText (_("Threads"));
- ip.SetWidth (1
0
0);
+ ip.SetWidth (1
5
0);
_list->InsertColumn (1, ip);
}
_list->InsertColumn (1, ip);
}
@@
-60,20
+63,31
@@
ServersListDialog::ServersListDialog (wxWindow* parent)
SetSizer (s);
s->Layout ();
s->SetSizeHints (this);
SetSizer (s);
s->Layout ();
s->SetSizeHints (this);
-
- _server_finder_connection = ServerFinder::instance()->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
}
void
-ServersListDialog::server
_found (ServerDescription s
)
+ServersListDialog::server
s_list_changed (
)
{
{
- wxListItem list_item;
- int const n = _list->GetItemCount ();
- list_item.SetId (n);
- _list->InsertItem (list_item);
+ _list->DeleteAllItems ();
+
+ int n = 0;
- _list->SetItem (n, 0, std_to_wx (s.host_name ()));
- _list->SetItem (n, 1, std_to_wx (lexical_cast<string> (s.threads ())));
+ BOOST_FOREACH (EncodeServerDescription i, EncodeServerFinder::instance()->servers()) {
+ wxListItem list_item;
+ list_item.SetId (n);
+ _list->InsertItem (list_item);
- _servers.push_back (s);
+ _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;
+ }
}
}