projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some missing override labels.
[dcpomatic.git]
/
src
/
lib
/
encode_server.h
diff --git
a/src/lib/encode_server.h
b/src/lib/encode_server.h
index d0c061eb3755d01d0887ee2a2ac906da95412728..f93d667467a0a4fe439651fe540d7dd3107e68fe 100644
(file)
--- a/
src/lib/encode_server.h
+++ b/
src/lib/encode_server.h
@@
-1,38
+1,45
@@
/*
/*
- Copyright (C) 2012-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
+
#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 "cross.h"
#include "exception_store.h"
#include "exception_store.h"
-#include
<boost/thread.hpp>
+#include
"server.h"
#include <boost/asio.hpp>
#include <boost/asio.hpp>
+#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
#include <string>
#include <boost/thread/condition.hpp>
#include <string>
-class Socket;
+
class Log;
class Log;
+class Socket;
+
/** @class EncodeServer
* @brief A class to run a server which can accept requests to perform JPEG2000
/** @class EncodeServer
* @brief A class to run a server which can accept requests to perform JPEG2000
@@
-41,34
+48,34
@@
class Log;
class EncodeServer : public Server, public ExceptionStore
{
public:
class EncodeServer : public Server, public ExceptionStore
{
public:
- EncodeServer (boo
st::shared_ptr<Log> log, boo
l verbose, int num_threads);
+ EncodeServer (bool verbose, int num_threads);
~EncodeServer ();
~EncodeServer ();
- void run ();
+ void run ()
override
;
private:
private:
- void handle (
boost::shared_ptr<Socket>)
;
+ void handle (
std::shared_ptr<Socket>) override
;
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 ();
void broadcast_thread ();
void broadcast_received ();
-
std::vector<boost::thread *>
_worker_threads;
- std::list<
boost::shared_ptr<Socket>
> _queue;
+
boost::thread_group
_worker_threads;
+ std::list<
std::shared_ptr<Socket>
> _queue;
boost::condition _full_condition;
boost::condition _empty_condition;
boost::condition _full_condition;
boost::condition _empty_condition;
- boost::shared_ptr<Log> _log;
bool _verbose;
int _num_threads;
bool _verbose;
int _num_threads;
+ Waker _waker;
struct Broadcast {
Broadcast ()
struct Broadcast {
Broadcast ()
- : thread (0)
- , socket (0)
+ : socket (0)
{}
{}
- boost::thread* thread;
+ boost::mutex mutex;
+ 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;
@@
-77,4
+84,5
@@
private:
} _broadcast;
};
} _broadcast;
};
+
#endif
#endif