projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do EncodeServerFinder 'disable' in a more sensible way.
[dcpomatic.git]
/
src
/
lib
/
encode_server_finder.cc
diff --git
a/src/lib/encode_server_finder.cc
b/src/lib/encode_server_finder.cc
index aa76e396bdea39c360dc71f28a112531f5894ce9..135a8bce8219539f676e37f18b3e05079f38b46c 100644
(file)
--- a/
src/lib/encode_server_finder.cc
+++ b/
src/lib/encode_server_finder.cc
@@
-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/>.
*/
*/
@@
-42,8
+43,7
@@
using boost::weak_ptr;
EncodeServerFinder* EncodeServerFinder::_instance = 0;
EncodeServerFinder::EncodeServerFinder ()
EncodeServerFinder* EncodeServerFinder::_instance = 0;
EncodeServerFinder::EncodeServerFinder ()
- : _disabled (false)
- , _search_thread (0)
+ : _search_thread (0)
, _listen_thread (0)
, _stop (false)
{
, _listen_thread (0)
, _stop (false)
{
@@
-57,21
+57,43
@@
EncodeServerFinder::start ()
_listen_thread = new boost::thread (boost::bind (&EncodeServerFinder::listen_thread, this));
}
_listen_thread = new boost::thread (boost::bind (&EncodeServerFinder::listen_thread, this));
}
+
EncodeServerFinder::~EncodeServerFinder ()
EncodeServerFinder::~EncodeServerFinder ()
+{
+ stop ();
+}
+
+void
+EncodeServerFinder::stop ()
{
_stop = true;
_search_condition.notify_all ();
if (_search_thread) {
{
_stop = true;
_search_condition.notify_all ();
if (_search_thread) {
- DCPOMATIC_ASSERT (_search_thread->joinable ());
- _search_thread->join ();
+ /* Ideally this would be a DCPOMATIC_ASSERT(_search_thread->joinable()) but we
+ can't throw exceptions from a destructor.
+ */
+ if (_search_thread->joinable ()) {
+ _search_thread->join ();
+ }
}
}
+ delete _search_thread;
+ _search_thread = 0;
_listen_io_service.stop ();
if (_listen_thread) {
_listen_io_service.stop ();
if (_listen_thread) {
- DCPOMATIC_ASSERT (_listen_thread->joinable ());
- _listen_thread->join ();
+ /* Ideally this would be a DCPOMATIC_ASSERT(_listen_thread->joinable()) but we
+ can't throw exceptions from a destructor.
+ */
+ if (_listen_thread->joinable ()) {
+ _listen_thread->join ();
+ }
}
}
+ delete _listen_thread;
+ _listen_thread = 0;
+
+ boost::mutex::scoped_lock lm (_servers_mutex);
+ _servers.clear ();
}
void
}
void