projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When the player is used in OpenGL mode, pass unscaled XYZ data through to the shader...
[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 a83e42214f373bb58823d68f9487129b3e6f1cab..d904a2ef08d394e54c3c8647feec83a740d29aaa 100644
(file)
--- a/
src/wx/servers_list_dialog.cc
+++ b/
src/wx/servers_list_dialog.cc
@@
-23,7
+23,6
@@
#include "lib/encode_server_finder.h"
#include "lib/encode_server_description.h"
#include <boost/lexical_cast.hpp>
#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;
@@
-35,7
+34,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 (
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;
@@
-49,7
+48,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);
}
@@
-76,14
+75,18
@@
ServersListDialog::servers_list_changed ()
_list->DeleteAllItems ();
int n = 0;
_list->DeleteAllItems ();
int n = 0;
- BOOST_FOREACH (EncodeServerDescription i, EncodeServerFinder::instance()->servers ()) {
+
+ 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 ()));
wxListItem list_item;
list_item.SetId (n);
_list->InsertItem (list_item);
_list->SetItem (n, 0, std_to_wx (i.host_name ()));
- _list->SetItem (n, 1, std_to_wx (lexical_cast<string> (i.threads ())));
-
+ 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;
}
}
++n;
}
}