Merge.

[dcpomatic.git] / src / lib / server.h

diff --git a/src/lib/server.h b/src/lib/server.h
index 314102c1c2b7f5c78ba7cc29c814d46214ab89bc..3e7c7945a34e69d246b1186ec963c5b67c157ce8 100644 (file)
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,70 +20,33 @@
 #ifndef DCPOMATIC_SERVER_H
 #define DCPOMATIC_SERVER_H
 
-/** @file src/server.h
- *  @brief Server class.
- */
-
-#include "exceptions.h"
 #include <boost/thread.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread/condition.hpp>
 #include <string>
 
 class Socket;
-class Log;
-
-namespace cxml {
-       class Node;
-}
 
-/** @class Server
- *  @brief A class to run a server which can accept requests to perform JPEG2000
- *  encoding work.
- */
-class Server : public ExceptionStore, public boost::noncopyable
+class Server : public boost::noncopyable
 {
 public:
-       Server (boost::shared_ptr<Log> log, bool verbose);
-       ~Server ();
+       Server (int port);
+       virtual ~Server ();
+
+       virtual void run ();
 
-       void run (int num_threads);
+protected:
+       boost::mutex _mutex;
+       bool _terminate;
 
 private:
-       void worker_thread ();
-       int process (boost::shared_ptr<Socket> socket, struct timeval &, struct timeval &);
-       void broadcast_thread ();
-       void broadcast_received ();
+       virtual void handle (boost::shared_ptr<Socket> socket) = 0;
+
        void start_accept ();
        void handle_accept (boost::shared_ptr<Socket>, boost::system::error_code const &);
 
-       bool _terminate;
-
-       std::vector<boost::thread *> _worker_threads;
-       std::list<boost::shared_ptr<Socket> > _queue;
-       boost::mutex _worker_mutex;
-       boost::condition _full_condition;
-       boost::condition _empty_condition;
-       boost::shared_ptr<Log> _log;
-       bool _verbose;
-
        boost::asio::io_service _io_service;
        boost::asio::ip::tcp::acceptor _acceptor;
-
-       struct Broadcast {
-
-               Broadcast ()
-                       : thread (0)
-                       , socket (0)
-               {}
-
-               boost::thread* thread;
-               boost::asio::ip::udp::socket* socket;
-               char buffer[64];
-               boost::asio::ip::udp::endpoint send_endpoint;
-               boost::asio::io_service io_service;
-
-       } _broadcast;
 };
 
 #endif