projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 1.43:1 (IMAX) ratio.
[dcpomatic.git]
/
src
/
lib
/
encode_server_finder.h
diff --git
a/src/lib/encode_server_finder.h
b/src/lib/encode_server_finder.h
index 49433ad42fe2a9cd24aa7e6d872ec326cf9f9c07..c639dfe3bf3aabdd641ee4295348699ca7cd2b0d 100644
(file)
--- a/
src/lib/encode_server_finder.h
+++ b/
src/lib/encode_server_finder.h
@@
-1,19
+1,20
@@
/*
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/>.
*/
*/
@@
-36,13
+37,7
@@
public:
static EncodeServerFinder* instance ();
static void drop ();
static EncodeServerFinder* instance ();
static void drop ();
- void disable () {
- _disabled = true;
- }
-
- bool disabled () const {
- return _disabled;
- }
+ void stop ();
std::list<EncodeServerDescription> servers () const;
std::list<EncodeServerDescription> servers () const;
@@
-64,8
+59,6
@@
private:
void config_changed (Config::Property what);
void config_changed (Config::Property what);
- bool _disabled;
-
/** Thread to periodically issue broadcasts and requests to find encoding servers */
boost::thread* _search_thread;
/** Thread to listen to the responses from servers */
/** Thread to periodically issue broadcasts and requests to find encoding servers */
boost::thread* _search_thread;
/** Thread to listen to the responses from servers */