projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make FileError say what path the problem was with.
[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 46d66b191e24d04cb103ffa5aeac9f3a669ae5aa..abfcc6d35c5512526aec86af38aeda773007a746 100644
(file)
--- a/
src/lib/encode_server_finder.h
+++ b/
src/lib/encode_server_finder.h
@@
-62,7
+62,7
@@
private:
void search_thread ();
void listen_thread ();
void search_thread ();
void listen_thread ();
- boo
l server_found (std::string) const
;
+ boo
st::optional<std::list<EncodeServerDescription>::iterator> server_found (std::string)
;
void start_accept ();
void handle_accept (boost::system::error_code ec, boost::shared_ptr<Socket> socket);
void start_accept ();
void handle_accept (boost::system::error_code ec, boost::shared_ptr<Socket> socket);
@@
-73,7
+73,9
@@
private:
/** Thread to listen to the responses from servers */
boost::thread* _listen_thread;
/** Thread to listen to the responses from servers */
boost::thread* _listen_thread;
+ /** Available servers */
std::list<EncodeServerDescription> _servers;
std::list<EncodeServerDescription> _servers;
+ /** Mutex for _servers */
mutable boost::mutex _servers_mutex;
boost::asio::io_service _listen_io_service;
mutable boost::mutex _servers_mutex;
boost::asio::io_service _listen_io_service;