merge socket and client connection

git-svn-id: svn://elaine/murooma/trunk@275 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-09-20 16:31:40 +00:00
parent 3dbbf8e3e5
commit d215580afe
10 changed files with 69 additions and 239 deletions

View file

@ -4,8 +4,7 @@
#include <thread>
#include <atomic>
#include "common/message.h"
#include "common/socketConnection.h"
#include "streamClient.h"
#include "clientConnection.h"
#include "decoder.h"
#include "stream.h"