Merge 1.0

[dcpomatic.git] / src / wx / server_dialog.cc

diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index c1dbc4bca18e588eeb20e0ce137e9bb26a97a8f8..04da9ad7d1496516f729bce120960dc4fe67d3ca 100644 (file)
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -21,6 +21,7 @@
 #include "server_dialog.h"
 #include "wx_util.h"
 
+using std::string;
 using boost::shared_ptr;
 
 ServerDialog::ServerDialog (wxWindow* parent)
@@ -41,12 +42,6 @@ ServerDialog::ServerDialog (wxWindow* parent)
        _host = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size);
        table->Add (_host, 1, wxEXPAND | wxALL);
 
-       add_label_to_sizer (table, this, _("Threads to use"), true);
-       _threads = new wxSpinCtrl (this, wxID_ANY);
-       table->Add (_threads, 1, wxEXPAND);
-
-       _threads->SetRange (0, 256);
-
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
        overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
@@ -61,18 +56,14 @@ ServerDialog::ServerDialog (wxWindow* parent)
 }
 
 void
-ServerDialog::set (ServerDescription server)
+ServerDialog::set (string server)
 {
-       _host->SetValue (std_to_wx (server.host_name ()));
-       _threads->SetValue (server.threads ());
+       _host->SetValue (std_to_wx (server));
 }
 
-ServerDescription
+string
 ServerDialog::get () const
 {
-       ServerDescription server;
-       server.set_host_name (wx_to_std (_host->GetValue ()));
-       server.set_threads (_threads->GetValue ());
-       return server;
+       return wx_to_std (_host->GetValue ());
 }