projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: tidying.
[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 a58c75382e35fcf0f30b6296b1b141091ad2d169..f8a30af54b295f9a3d6906bd5ab3b878ee6fe805 100644
(file)
--- a/
src/lib/encode_server_finder.h
+++ b/
src/lib/encode_server_finder.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
18
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,19
+18,23
@@
*/
*/
+
/** @file src/lib/encode_server_finder.h
* @brief EncodeServerFinder class.
*/
/** @file src/lib/encode_server_finder.h
* @brief EncodeServerFinder class.
*/
-#include "signaller.h"
-#include "encode_server_description.h"
+
#include "config.h"
#include "config.h"
+#include "encode_server_description.h"
#include "exception_store.h"
#include "exception_store.h"
+#include "signaller.h"
#include <boost/signals2.hpp>
#include <boost/thread/condition.hpp>
#include <boost/signals2.hpp>
#include <boost/thread/condition.hpp>
+
class Socket;
class Socket;
+
/** @class EncodeServerFinder
* @brief Locater of encoding servers.
*
/** @class EncodeServerFinder
* @brief Locater of encoding servers.
*
@@
-62,9
+66,8
@@
private:
void search_thread ();
void listen_thread ();
void search_thread ();
void listen_thread ();
- boost::optional<std::list<EncodeServerDescription>::iterator> server_found (std::string);
void start_accept ();
void start_accept ();
- void handle_accept (boost::system::error_code ec
, std::shared_ptr<Socket> socket
);
+ void handle_accept (boost::system::error_code ec);
void config_changed (Config::Property what);
void config_changed (Config::Property what);
@@
-85,5
+88,7
@@
private:
boost::condition _search_condition;
boost::mutex _search_condition_mutex;
boost::condition _search_condition;
boost::mutex _search_condition_mutex;
+ std::shared_ptr<Socket> _accept_socket;
+
static EncodeServerFinder* _instance;
};
static EncodeServerFinder* _instance;
};