diff options
| -rw-r--r-- | src/client/HTTPClientReceiver.cpp | 10 | ||||
| -rw-r--r-- | src/client/HTTPClientReceiver.hpp | 17 | ||||
| -rw-r--r-- | src/client/OSCClientReceiver.cpp | 5 | ||||
| -rw-r--r-- | src/client/OSCClientReceiver.hpp | 16 |
4 files changed, 21 insertions, 27 deletions
diff --git a/src/client/HTTPClientReceiver.cpp b/src/client/HTTPClientReceiver.cpp index b009dbf0..0ec5aaa4 100644 --- a/src/client/HTTPClientReceiver.cpp +++ b/src/client/HTTPClientReceiver.cpp @@ -15,20 +15,16 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <assert.h> #include <errno.h> - -#include <cassert> -#include <cstring> -#include <list> -#include <sstream> - +#include <string.h> #include <sys/socket.h> #include <libsoup/soup.h> +#include "ingen/shared/World.hpp" #include "raul/log.hpp" -#include "ingen/shared/World.hpp" #include "HTTPClientReceiver.hpp" #define LOG(s) s << "[HTTPClientReceiver] " diff --git a/src/client/HTTPClientReceiver.hpp b/src/client/HTTPClientReceiver.hpp index 8bc4803a..d7165c81 100644 --- a/src/client/HTTPClientReceiver.hpp +++ b/src/client/HTTPClientReceiver.hpp @@ -19,14 +19,16 @@ #define INGEN_CLIENT_HTTPCLIENTRECEIVER_HPP #include <cstdlib> + #include <boost/utility.hpp> #include <glibmm/thread.h> -#include "sord/sordmm.hpp" + +#include "ingen/ClientInterface.hpp" +#include "ingen/serialisation/Parser.hpp" #include "raul/Deletable.hpp" #include "raul/SharedPtr.hpp" #include "raul/Thread.hpp" -#include "ingen/ClientInterface.hpp" -#include "ingen/serialisation/Parser.hpp" +#include "sord/sordmm.hpp" typedef struct _SoupSession SoupSession; typedef struct _SoupMessage SoupMessage; @@ -68,14 +70,13 @@ private: }; friend class Listener; - SharedPtr<Listener> _listener; + SharedPtr<Listener> _listener; Glib::Mutex _mutex; SharedPtr<ClientInterface> _target; - - Shared::World* _world; - const std::string _url; - bool _quit_flag; + Shared::World* _world; + const std::string _url; + bool _quit_flag; }; } // namespace Client diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp index e71d19d5..4fef1d1c 100644 --- a/src/client/OSCClientReceiver.cpp +++ b/src/client/OSCClientReceiver.cpp @@ -19,9 +19,6 @@ #include <stdio.h> #include <string.h> -#include <list> -#include <sstream> - #include "raul/log.hpp" #include "raul/AtomLiblo.hpp" #include "raul/Path.hpp" @@ -40,8 +37,8 @@ namespace Client { OSCClientReceiver::OSCClientReceiver(int listen_port, SharedPtr<ClientInterface> target) : _target(target) - , _listen_port(listen_port) , _st(NULL) + , _listen_port(listen_port) { #ifdef RAUL_LOG_DEBUG start(true); diff --git a/src/client/OSCClientReceiver.hpp b/src/client/OSCClientReceiver.hpp index c685f969..3b7f5db0 100644 --- a/src/client/OSCClientReceiver.hpp +++ b/src/client/OSCClientReceiver.hpp @@ -19,11 +19,13 @@ #define INGEN_CLIENT_OSCCLIENTRECEIVER_HPP #include <cstdlib> + #include <boost/utility.hpp> #include <lo/lo.h> + +#include "ingen/ClientInterface.hpp" #include "raul/Deletable.hpp" #include "raul/SharedPtr.hpp" -#include "ingen/ClientInterface.hpp" namespace Ingen { namespace Client { @@ -65,13 +67,11 @@ private: static int unknown_cb(const char* path, const char* types, lo_arg** argv, int argc, void* data, void* osc_receiver); SharedPtr<ClientInterface> _target; - - int _listen_port; - lo_server_thread _st; - - Raul::URI _delta_uri; - Resource::Properties _delta_remove; - Resource::Properties _delta_add; + lo_server_thread _st; + Raul::URI _delta_uri; + Resource::Properties _delta_remove; + Resource::Properties _delta_add; + int _listen_port; LO_HANDLER(error); LO_HANDLER(response_ok); |