Merge master.

[dcpomatic.git] / src / lib / server_finder.cc

diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index ed6016c6723f51e1be2f028b67fc952fda482978..14cb3af5999ac5ff7ccb434d39371addcbb18a6d 100644 (file)
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -18,7 +18,7 @@
 */
 
 #include <libcxml/cxml.h>
-#include <libdcp/raw_convert.h>
+#include <dcp/raw_convert.h>
 #include "server_finder.h"
 #include "exceptions.h"
 #include "util.h"
@@ -27,13 +27,12 @@
 #include "ui_signaller.h"
 
 using std::string;
-using std::stringstream;
 using std::list;
 using std::vector;
 using std::cout;
 using boost::shared_ptr;
 using boost::scoped_array;
-using libdcp::raw_convert;
+using dcp::raw_convert;
 
 ServerFinder* ServerFinder::_instance = 0;
 
@@ -103,7 +102,7 @@ void
 ServerFinder::listen_thread ()
 try
 {
-       while (1) {
+       while (true) {
                shared_ptr<Socket> sock (new Socket (60));
 
                try {
@@ -116,9 +115,9 @@ try
                scoped_array<char> buffer (new char[length]);
                sock->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
                
-               stringstream s (buffer.get());
+               string s (buffer.get());
                shared_ptr<cxml::Document> 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)) {