projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compile fix.
[dcpomatic.git]
/
src
/
lib
/
server.h
diff --git
a/src/lib/server.h
b/src/lib/server.h
index 32ba8dc4b96757fe0d3938317e2fe1c0c9abff2b..e6d3743691e09cc2b3054300e8683031b5534ea1 100644
(file)
--- a/
src/lib/server.h
+++ b/
src/lib/server.h
@@
-26,10
+26,15
@@
#include <boost/thread.hpp>
#include <boost/asio.hpp>
#include <boost/thread/condition.hpp>
#include <boost/thread.hpp>
#include <boost/asio.hpp>
#include <boost/thread/condition.hpp>
+#include <libxml++/libxml++.h>
#include "log.h"
class Socket;
#include "log.h"
class Socket;
+namespace cxml {
+ class Node;
+}
+
/** @class ServerDescription
* @brief Class to describe a server to which we can send encoding work.
*/
/** @class ServerDescription
* @brief Class to describe a server to which we can send encoding work.
*/
@@
-44,6
+49,10
@@
public:
, _threads (t)
{}
, _threads (t)
{}
+ ServerDescription (boost::shared_ptr<const cxml::Node>);
+
+ /* 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;
@@
-62,7
+71,7
@@
public:
_threads = t;
}
_threads = t;
}
-
std::string as_metadata (
) const;
+
void as_xml (xmlpp::Node *
) const;
static ServerDescription * create_from_metadata (std::string v);
static ServerDescription * create_from_metadata (std::string v);
@@
-73,10
+82,10
@@
private:
int _threads;
};
int _threads;
};
-class Server
+class Server
: public boost::noncopyable
{
public:
{
public:
- Server (
Log*
log);
+ Server (
boost::shared_ptr<Log>
log);
void run (int num_threads);
void run (int num_threads);
@@
-88,5
+97,5
@@
private:
std::list<boost::shared_ptr<Socket> > _queue;
boost::mutex _worker_mutex;
boost::condition _worker_condition;
std::list<boost::shared_ptr<Socket> > _queue;
boost::mutex _worker_mutex;
boost::condition _worker_condition;
-
Log*
_log;
+
boost::shared_ptr<Log>
_log;
};
};