projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
If there is no end time in an AVSubtitle it seems we should use the AVPacket's duration.
[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 63f1cd6a9b87c2330af12d04d26385a45b16c7e8..dc261ff1c8e718de348017b7170ccfa06e597db6 100644
(file)
--- a/
src/wx/servers_list_dialog.h
+++ b/
src/wx/servers_list_dialog.h
@@
-1,33
+1,40
@@
/*
/*
- 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.
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 "lib/encode_server.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/listctrl.h>
#include <wx/wx.h>
#include <wx/listctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
+#include <boost/signals2.hpp>
class ServersListDialog : public wxDialog
{
public:
class ServersListDialog : public wxDialog
{
public:
- ServersListDialog (wxWindow *);
+
explicit
ServersListDialog (wxWindow *);
private:
private:
- void server
_found (ServerDescription
);
+ void server
s_list_changed (
);
- std::list<ServerDescription> _servers;
wxListCtrl* _list;
wxListCtrl* _list;
+
+ boost::signals2::scoped_connection _server_finder_connection;
};
};