moved files

Makefile

@@ -25,8 +25,7 @@ _COMMON_LIBS = -lm -ljpeg -pthread -lrt
 
 _USTR_LIBS = $(_COMMON_LIBS) -levent -levent_pthreads -luuid
 _USTR_SRCS = $(shell ls \
-	src/libs/common/*.c \
-	src/libs/memsink/*.c \
+	src/libs/*.c \
 	src/ustreamer/*.c \
 	src/ustreamer/http/*.c \
 	src/ustreamer/data/*.c \
@@ -36,8 +35,7 @@ _USTR_SRCS = $(shell ls \
 
 _REC_LIBS = $(_COMMON_LIBS)
 _REC_SRCS = $(shell ls \
-	src/libs/common/*.c \
-	src/libs/memsink/*.c \
+	src/libs/*.c \
 	src/recorder/*.c \
 )
 

src/libs/memsink.h

@@ -35,9 +35,9 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "../common/tools.h"
-#include "../common/logging.h"
-#include "../common/frame.h"
+#include "tools.h"
+#include "logging.h"
+#include "frame.h"
 
 
 #ifndef CFG_MEMSINK_MAX_DATA

src/recorder/main.c

@@ -1,9 +1,9 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "../libs/common/logging.h"
-#include "../libs/common/frame.h"
-#include "../libs/memsink/memsink.h"
+#include "../libs/logging.h"
+#include "../libs/frame.h"
+#include "../libs/memsink.h"
 
 int main(void) {
 	LOGGING_INIT;

src/ustreamer/blank.h

@@ -27,10 +27,10 @@
 
 #include <linux/videodev2.h>
 
-#include "../libs/common/tools.h"
-#include "../libs/common/logging.h"
-#include "../libs/common/frame.h"
-#include "../libs/common/unjpeg.h"
+#include "../libs/tools.h"
+#include "../libs/logging.h"
+#include "../libs/frame.h"
+#include "../libs/unjpeg.h"
 
 #include "data/blank_jpeg.h"
 

src/ustreamer/data/index_html.h

@@ -24,7 +24,7 @@
 
 #include <sys/types.h>
 
-#include "../../libs/common/config.h"
+#include "../../libs/config.h"
 
 
 extern const char *const HTML_INDEX_PAGE;

src/ustreamer/device.h

@@ -41,10 +41,10 @@
 #include <linux/videodev2.h>
 #include <linux/v4l2-controls.h>
 
-#include "../libs/common/tools.h"
-#include "../libs/common/logging.h"
-#include "../libs/common/threading.h"
-#include "../libs/common/frame.h"
+#include "../libs/tools.h"
+#include "../libs/logging.h"
+#include "../libs/threading.h"
+#include "../libs/frame.h"
 
 #include "xioctl.h"
 

src/ustreamer/encoder.h

@@ -30,10 +30,10 @@
 #include <pthread.h>
 #include <linux/videodev2.h>
 
-#include "../libs/common/tools.h"
-#include "../libs/common/threading.h"
-#include "../libs/common/logging.h"
-#include "../libs/common/frame.h"
+#include "../libs/tools.h"
+#include "../libs/threading.h"
+#include "../libs/logging.h"
+#include "../libs/frame.h"
 
 #include "device.h"
 

src/ustreamer/encoders/cpu/encoder.h

@@ -31,8 +31,8 @@
 
 #include <linux/videodev2.h>
 
-#include "../../../libs/common/tools.h"
-#include "../../../libs/common/frame.h"
+#include "../../../libs/tools.h"
+#include "../../../libs/frame.h"
 
 
 void cpu_encoder_compress(const frame_s *src, frame_s *dest, unsigned quality);

src/ustreamer/encoders/hw/encoder.h

@@ -29,7 +29,7 @@
 
 #include <linux/videodev2.h>
 
-#include "../../../libs/common/frame.h"
+#include "../../../libs/frame.h"
 
 #include "huffman.h"
 

src/ustreamer/encoders/omx/component.h

@@ -28,7 +28,7 @@
 #include <IL/OMX_Core.h>
 #include <IL/OMX_Component.h>
 
-#include "../../../libs/common/logging.h"
+#include "../../../libs/logging.h"
 
 #include "formatters.h"
 

src/ustreamer/encoders/omx/encoder.h

@@ -35,9 +35,9 @@
 #include <IL/OMX_Broadcom.h>
 #include <interface/vcos/vcos_semaphore.h>
 
-#include "../../../libs/common/tools.h"
-#include "../../../libs/common/logging.h"
-#include "../../../libs/common/frame.h"
+#include "../../../libs/tools.h"
+#include "../../../libs/logging.h"
+#include "../../../libs/frame.h"
 
 #include "formatters.h"
 #include "component.h"

src/ustreamer/encoders/omx/formatters.h

@@ -29,8 +29,8 @@
 #include <IL/OMX_Core.h>
 #include <IL/OMX_Image.h>
 
-#include "../../../libs/common/tools.h"
-#include "../../../libs/common/logging.h"
+#include "../../../libs/tools.h"
+#include "../../../libs/logging.h"
 
 
 #define LOG_ERROR_OMX(_error, _msg, ...) { \

src/ustreamer/gpio/gpio.h

@@ -30,9 +30,9 @@
 #include <pthread.h>
 #include <gpiod.h>
 
-#include "../../libs/common/tools.h"
-#include "../../libs/common/logging.h"
-#include "../../libs/common/threading.h"
+#include "../../libs/tools.h"
+#include "../../libs/logging.h"
+#include "../../libs/threading.h"
 
 
 typedef struct {

src/ustreamer/h264/encoder.h

@@ -34,10 +34,10 @@
 #include <interface/mmal/util/mmal_component_wrapper.h>
 #include <interface/mmal/util/mmal_util_params.h>
 
-#include "../../libs/common/tools.h"
-#include "../../libs/common/logging.h"
-#include "../../libs/common/frame.h"
-#include "../../libs/common/unjpeg.h"
+#include "../../libs/tools.h"
+#include "../../libs/logging.h"
+#include "../../libs/frame.h"
+#include "../../libs/unjpeg.h"
 
 
 typedef struct {

src/ustreamer/http/base64.h

@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "../../libs/common/tools.h"
+#include "../../libs/tools.h"
 
 
 char *base64_encode(const uint8_t *str);

src/ustreamer/http/bev.h

@@ -28,8 +28,8 @@
 #include <event2/util.h>
 #include <event2/bufferevent.h>
 
-#include "../../libs/common/tools.h"
-#include "../../libs/common/logging.h"
+#include "../../libs/tools.h"
+#include "../../libs/logging.h"
 
 
 char *bufferevent_my_format_reason(short what);

src/ustreamer/http/mime.h

@@ -26,7 +26,7 @@
 
 #include <event2/util.h>
 
-#include "../../libs/common/tools.h"
+#include "../../libs/tools.h"
 
 
 const char *guess_mime_type(const char *str);

src/ustreamer/http/path.h

@@ -28,7 +28,7 @@
 #endif
 #include <string.h>
 
-#include "../../libs/common/tools.h"
+#include "../../libs/tools.h"
 
 
 char *simplify_request_path(const char *str);

src/ustreamer/http/server.h

@@ -53,11 +53,11 @@
 #	error Required libevent-pthreads support
 #endif
 
-#include "../../libs/common/tools.h"
-#include "../../libs/common/threading.h"
-#include "../../libs/common/logging.h"
-#include "../../libs/common/process.h"
-#include "../../libs/common/frame.h"
+#include "../../libs/tools.h"
+#include "../../libs/threading.h"
+#include "../../libs/logging.h"
+#include "../../libs/process.h"
+#include "../../libs/frame.h"
 #include "../data/index_html.h"
 #include "../encoder.h"
 #include "../stream.h"

src/ustreamer/http/static.h

@@ -29,8 +29,8 @@
 
 #include <sys/stat.h>
 
-#include "../../libs/common/tools.h"
-#include "../../libs/common/logging.h"
+#include "../../libs/tools.h"
+#include "../../libs/logging.h"
 
 #include "path.h"
 

src/ustreamer/http/unix.h

@@ -35,8 +35,8 @@
 #include <event2/http.h>
 #include <event2/util.h>
 
-#include "../../libs/common/tools.h"
-#include "../../libs/common/logging.h"
+#include "../../libs/tools.h"
+#include "../../libs/logging.h"
 
 
 evutil_socket_t evhttp_my_bind_unix(struct evhttp *http, const char *path, bool rm, mode_t mode);

src/ustreamer/main.c

@@ -40,9 +40,9 @@
 #	include <IL/OMX_Core.h>
 #endif
 
-#include "../libs/common/tools.h"
-#include "../libs/common/threading.h"
-#include "../libs/common/logging.h"
+#include "../libs/tools.h"
+#include "../libs/threading.h"
+#include "../libs/logging.h"
 
 #include "options.h"
 #include "device.h"

src/ustreamer/options.h

@@ -33,11 +33,11 @@
 #include <errno.h>
 #include <assert.h>
 
-#include "../libs/common/config.h"
-#include "../libs/common/logging.h"
-#include "../libs/common/process.h"
-#include "../libs/common/frame.h"
-#include "../libs/memsink/memsink.h"
+#include "../libs/config.h"
+#include "../libs/logging.h"
+#include "../libs/process.h"
+#include "../libs/frame.h"
+#include "../libs/memsink.h"
 
 #include "device.h"
 #include "encoder.h"

src/ustreamer/stream.h

@@ -32,11 +32,11 @@
 #include <pthread.h>
 #include <linux/videodev2.h>
 
-#include "../libs/common/tools.h"
-#include "../libs/common/threading.h"
-#include "../libs/common/logging.h"
-#include "../libs/common/frame.h"
-#include "../libs/memsink/memsink.h"
+#include "../libs/tools.h"
+#include "../libs/threading.h"
+#include "../libs/logging.h"
+#include "../libs/frame.h"
+#include "../libs/memsink.h"
 
 #include "blank.h"
 #include "device.h"

src/ustreamer/workers.h

@@ -29,9 +29,9 @@
 
 #include <pthread.h>
 
-#include "../libs/common/tools.h"
-#include "../libs/common/threading.h"
-#include "../libs/common/logging.h"
+#include "../libs/tools.h"
+#include "../libs/threading.h"
+#include "../libs/logging.h"
 
 
 typedef struct worker_sx {

src/ustreamer/xioctl.h

@@ -26,8 +26,8 @@
 
 #include <sys/ioctl.h>
 
-#include "../libs/common/tools.h"
-#include "../libs/common/logging.h"
+#include "../libs/tools.h"
+#include "../libs/logging.h"
 
 
 #ifndef CFG_XIOCTL_RETRIES