projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assorted tidying.
[dcpomatic.git]
/
src
/
lib
/
encode_server.h
diff --git
a/src/lib/encode_server.h
b/src/lib/encode_server.h
index a43cea7efea8228a02a06d063766bd861948477f..6e24a19849827cdde20c276e79d331b8a2cd1ab5 100644
(file)
--- a/
src/lib/encode_server.h
+++ b/
src/lib/encode_server.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,13
+18,16
@@
*/
*/
+
#ifndef DCPOMATIC_ENCODE_SERVER_H
#define DCPOMATIC_ENCODE_SERVER_H
#ifndef DCPOMATIC_ENCODE_SERVER_H
#define DCPOMATIC_ENCODE_SERVER_H
+
/** @file src/encode_server.h
* @brief EncodeServer class.
*/
/** @file src/encode_server.h
* @brief EncodeServer class.
*/
+
#include "server.h"
#include "exception_store.h"
#include <boost/thread.hpp>
#include "server.h"
#include "exception_store.h"
#include <boost/thread.hpp>
@@
-32,9
+35,11
@@
#include <boost/thread/condition.hpp>
#include <string>
#include <boost/thread/condition.hpp>
#include <string>
+
class Socket;
class Log;
class Socket;
class Log;
+
/** @class EncodeServer
* @brief A class to run a server which can accept requests to perform JPEG2000
* encoding work.
/** @class EncodeServer
* @brief A class to run a server which can accept requests to perform JPEG2000
* encoding work.
@@
-48,14
+53,14
@@
public:
void run ();
private:
void run ();
private:
- void handle (
boost
::shared_ptr<Socket>);
+ void handle (
std
::shared_ptr<Socket>);
void worker_thread ();
void worker_thread ();
- int process (
boost
::shared_ptr<Socket> socket, struct timeval &, struct timeval &);
+ int process (
std
::shared_ptr<Socket> socket, struct timeval &, struct timeval &);
void broadcast_thread ();
void broadcast_received ();
boost::thread_group _worker_threads;
void broadcast_thread ();
void broadcast_received ();
boost::thread_group _worker_threads;
- std::list<
boost::shared_ptr<Socket>
> _queue;
+ std::list<
std::shared_ptr<Socket>
> _queue;
boost::condition _full_condition;
boost::condition _empty_condition;
bool _verbose;
boost::condition _full_condition;
boost::condition _empty_condition;
bool _verbose;
@@
-77,4
+82,5
@@
private:
} _broadcast;
};
} _broadcast;
};
+
#endif
#endif