X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver_finder.cc;h=14cb3af5999ac5ff7ccb434d39371addcbb18a6d;hb=8c7a308c03e4b4196b4e2379a26d432b100ae2b1;hp=de8a3852c5cf45c0abd52faaf94b4f08ee24e94c;hpb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;p=dcpomatic.git diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc index de8a3852c..14cb3af59 100644 --- a/src/lib/server_finder.cc +++ b/src/lib/server_finder.cc @@ -27,7 +27,6 @@ #include "ui_signaller.h" using std::string; -using std::stringstream; using std::list; using std::vector; using std::cout; @@ -103,7 +102,7 @@ void ServerFinder::listen_thread () try { - while (1) { + while (true) { shared_ptr sock (new Socket (60)); try { @@ -116,9 +115,9 @@ try scoped_array buffer (new char[length]); sock->read (reinterpret_cast (buffer.get()), length); - stringstream s (buffer.get()); + string s (buffer.get()); shared_ptr xml (new cxml::Document ("ServerAvailable")); - xml->read_stream (s); + xml->read_string (s); string const ip = sock->socket().remote_endpoint().address().to_string (); if (!server_found (ip)) {