Merge branch 'v2.15.x' of ssh://main.carlh.net/home/carl/git/dcpomatic into v2.15.x

[dcpomatic.git] / src / wx / servers_list_dialog.h

diff --git a/src/wx/servers_list_dialog.h b/src/wx/servers_list_dialog.h
index 0662a141d5b808d93f0c6fb9a8bf9fb2ef262f75..309cde77e39fc0405890120c7b2f82396425658e 100644 (file)
--- a/src/wx/servers_list_dialog.h
+++ b/src/wx/servers_list_dialog.h
@@ -1,35 +1,37 @@
 /*
-    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 "lib/encode_server.h"
 #include <wx/wx.h>
 #include <wx/listctrl.h>
-#include "lib/server_finder.h"
+#include <boost/signals2.hpp>
 
 class ServersListDialog : public wxDialog
 {
 public:
-       ServersListDialog (wxWindow *);
+       explicit ServersListDialog (wxWindow *);
 
 private:
-       void server_found (ServerDescription);
+       void servers_list_changed ();
 
-       ServerFinder _server_finder;
-       std::list<ServerDescription> _servers;
        wxListCtrl* _list;
+
+       boost::signals2::scoped_connection _server_finder_connection;
 };