projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a LanguageTag for closed caption tracks.
[dcpomatic.git]
/
src
/
lib
/
encode_server.h
diff --git
a/src/lib/encode_server.h
b/src/lib/encode_server.h
index 14dc77398a660b730258974cc7b3fee8f9f2d74e..a43cea7efea8228a02a06d063766bd861948477f 100644
(file)
--- a/
src/lib/encode_server.h
+++ b/
src/lib/encode_server.h
@@
-54,7
+54,7
@@
private:
void broadcast_thread ();
void broadcast_received ();
void broadcast_thread ();
void broadcast_received ();
-
std::vector<boost::thread *>
_worker_threads;
+
boost::thread_group
_worker_threads;
std::list<boost::shared_ptr<Socket> > _queue;
boost::condition _full_condition;
boost::condition _empty_condition;
std::list<boost::shared_ptr<Socket> > _queue;
boost::condition _full_condition;
boost::condition _empty_condition;
@@
-64,12
+64,11
@@
private:
struct Broadcast {
Broadcast ()
struct Broadcast {
Broadcast ()
- : thread (0)
- , socket (0)
+ : socket (0)
{}
boost::mutex mutex;
{}
boost::mutex mutex;
- boost::thread
*
thread;
+ boost::thread thread;
boost::asio::ip::udp::socket* socket;
char buffer[64];
boost::asio::ip::udp::endpoint send_endpoint;
boost::asio::ip::udp::socket* socket;
char buffer[64];
boost::asio::ip::udp::endpoint send_endpoint;