projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
src
/
lib
/
server.h
diff --git
a/src/lib/server.h
b/src/lib/server.h
index e2e1d46eca0f34f3748f708787b34437f1dc8402..51dc8774e166372f6327d3753552bfac2f44601b 100644
(file)
--- a/
src/lib/server.h
+++ b/
src/lib/server.h
@@
-25,14
+25,14
@@
* encoding work, and a class to implement such a server.
*/
* encoding work, and a class to implement such a server.
*/
-#include <string>
+#include "log.h"
+#include "exceptions.h"
+#include <libxml++/libxml++.h>
#include <boost/thread.hpp>
#include <boost/asio.hpp>
#include <boost/thread/condition.hpp>
#include <boost/optional.hpp>
#include <boost/thread.hpp>
#include <boost/asio.hpp>
#include <boost/thread/condition.hpp>
#include <boost/optional.hpp>
-#include <libxml++/libxml++.h>
-#include "log.h"
-#include "exceptions.h"
+#include <string>
class Socket;
class Socket;
@@
-50,7
+50,7
@@
public:
: _host_name ("")
, _threads (1)
{}
: _host_name ("")
, _threads (1)
{}
-
+
/** @param h Server host name or IP address in string form.
* @param t Number of threads to use on the server.
*/
/** @param h Server host name or IP address in string form.
* @param t Number of threads to use on the server.
*/
@@
-60,7
+60,7
@@
public:
{}
/* Default copy constructor is fine */
{}
/* Default copy constructor is fine */
-
+
/** @return server's host name or IP address in string form */
std::string host_name () const {
return _host_name;
/** @return server's host name or IP address in string form */
std::string host_name () const {
return _host_name;
@@
-121,13
+121,13
@@
private:
: thread (0)
, socket (0)
{}
: thread (0)
, socket (0)
{}
-
+
boost::thread* thread;
boost::asio::ip::udp::socket* socket;
char buffer[64];
boost::asio::ip::udp::endpoint send_endpoint;
boost::asio::io_service io_service;
boost::thread* thread;
boost::asio::ip::udp::socket* socket;
char buffer[64];
boost::asio::ip::udp::endpoint send_endpoint;
boost::asio::io_service io_service;
-
+
} _broadcast;
};
} _broadcast;
};