projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo preventing audio sync fixes when audio follows video.
[dcpomatic.git]
/
src
/
lib
/
server.h
diff --git
a/src/lib/server.h
b/src/lib/server.h
index 58cfe0b3fffa8cc08e5f099a64aedfa201a76d6f..89aeca62632c3aeda94bff27b43e7fe494d6efa6 100644
(file)
--- a/
src/lib/server.h
+++ b/
src/lib/server.h
@@
-28,6
+28,8
@@
#include <boost/thread/condition.hpp>
#include "log.h"
#include <boost/thread/condition.hpp>
#include "log.h"
+class Socket;
+
/** @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.
*/
@@
-74,17
+76,17
@@
private:
class Server
{
public:
class Server
{
public:
- Server (
Log*
log);
+ Server (
boost::shared_ptr<Log>
log);
- void run ();
+ void run (
int num_threads
);
private:
void worker_thread ();
private:
void worker_thread ();
- int process (boost::shared_ptr<
boost::asio::ip::tcp::s
ocket> socket);
-
+ int process (boost::shared_ptr<
S
ocket> socket);
+
std::vector<boost::thread *> _worker_threads;
std::vector<boost::thread *> _worker_threads;
- std::list<boost::shared_ptr<
boost::asio::ip::tcp::s
ocket> > _queue;
+ std::list<boost::shared_ptr<
S
ocket> > _queue;
boost::mutex _worker_mutex;
boost::condition _worker_condition;
boost::mutex _worker_mutex;
boost::condition _worker_condition;
-
Log*
_log;
+
boost::shared_ptr<Log>
_log;
};
};