refactoring

janus/Makefile

@@ -12,7 +12,7 @@ _PLUGIN = libjanus_ustreamer.so
 _CFLAGS = -fPIC -MD -c -std=c11 -Wall -Wextra -D_GNU_SOURCE $(shell pkg-config --cflags glib-2.0) $(CFLAGS)
 _LDFLAGS = -shared -lm -pthread -lrt -ljansson -lopus -lasound $(shell pkg-config --libs glib-2.0) $(LDFLAGS)
 
-_SRCS = $(shell ls src/*.c)
+_SRCS = $(shell ls src/uslibs/*.c src/*.c)
 
 _BUILD = build
 

janus/src/audio.h

@@ -37,9 +37,10 @@
 #include <alsa/asoundlib.h>
 #include <opus/opus.h>
 
-#include "tools.h"
+#include "uslibs/tools.h"
+#include "uslibs/threading.h"
+
 #include "jlogging.h"
-#include "threading.h"
 #include "queue.h"
 
 

janus/src/base64.c

@@ -1 +0,0 @@
-../../src/libs/base64.c

janus/src/base64.h

@@ -1 +0,0 @@
-../../src/libs/base64.h

janus/src/config.h

@@ -1 +0,0 @@
-../../src/libs/config.h

janus/src/frame.c

@@ -1 +0,0 @@
-../../src/libs/frame.c

janus/src/frame.h

@@ -1 +0,0 @@
-../../src/libs/frame.h

janus/src/jlogging.h

@@ -22,7 +22,7 @@
 
 #include <janus/plugins/plugin.h>
 
-#include "tools.h"
+#include "uslibs/tools.h"
 
 
 #define JLOG_INFO(_prefix, _msg, ...)	JANUS_LOG(LOG_INFO, "== ustreamer/%-9s -- " _msg "\n", _prefix, ##__VA_ARGS__)

janus/src/list.h

@@ -1 +0,0 @@
-../../src/libs/list.h

janus/src/memsinksh.h

@@ -1 +0,0 @@
-../../src/libs/memsinksh.h

janus/src/plugin.c

@@ -38,12 +38,13 @@
 #include <janus/config.h>
 #include <janus/plugins/plugin.h>
 
-#include "config.h"
+#include "uslibs/config.h"
-#include "tools.h"
+#include "uslibs/tools.h"
+#include "uslibs/threading.h"
+#include "uslibs/list.h"
+#include "uslibs/memsinksh.h"
+
 #include "jlogging.h"
-#include "threading.h"
-#include "list.h"
-#include "memsinksh.h"
 #include "audio.h"
 #include "rtpv.h"
 #include "rtpa.h"

janus/src/queue.h

@@ -27,8 +27,8 @@
 
 #include <pthread.h>
 
-#include "tools.h"
+#include "uslibs/tools.h"
-#include "threading.h"
+#include "uslibs/threading.h"
 
 
 // Based on https://github.com/seifzadeh/c-pthread-queue/blob/master/queue.h

janus/src/rtp.h

@@ -31,7 +31,7 @@
 
 #include <sys/types.h>
 
-#include "tools.h"
+#include "uslibs/tools.h"
 
 
 // https://stackoverflow.com/questions/47635545/why-webrtc-chose-rtp-max-packet-size-to-1200-bytes

janus/src/rtpa.h

@@ -32,9 +32,9 @@
 
 #include <sys/types.h>
 
-#include "tools.h"
+#include "uslibs/tools.h"
-#include "threading.h"
+#include "uslibs/threading.h"
-#include "audio.h"
+
 #include "rtp.h"
 
 

janus/src/rtpv.h

@@ -36,10 +36,11 @@
 
 #include <pthread.h>
 
-#include "tools.h"
+#include "uslibs/tools.h"
-#include "threading.h"
+#include "uslibs/threading.h"
-#include "frame.h"
+#include "uslibs/frame.h"
-#include "base64.h"
+#include "uslibs/base64.h"
+
 #include "rtp.h"
 
 

janus/src/threading.h

@@ -1 +0,0 @@
-../../src/libs/threading.h

janus/src/tools.h

@@ -1 +0,0 @@
-../../src/libs/tools.h

janus/src/uslibs/base64.c

@@ -0,0 +1 @@
+../../../src/libs/base64.c

janus/src/uslibs/base64.h

@@ -0,0 +1 @@
+../../../src/libs/base64.h

janus/src/uslibs/config.h

@@ -0,0 +1 @@
+../../../src/libs/config.h

janus/src/uslibs/frame.c

@@ -0,0 +1 @@
+../../../src/libs/frame.c

janus/src/uslibs/frame.h

@@ -0,0 +1 @@
+../../../src/libs/frame.h

janus/src/uslibs/list.h

@@ -0,0 +1 @@
+../../../src/libs/list.h

janus/src/uslibs/memsinksh.h

@@ -0,0 +1 @@
+../../../src/libs/memsinksh.h

janus/src/uslibs/threading.h

@@ -0,0 +1 @@
+../../../src/libs/threading.h

janus/src/uslibs/tools.h

@@ -0,0 +1 @@
+../../../src/libs/tools.h

python/setup.py

@@ -1,10 +1,21 @@
 import os
 
+from typing import List
+
 from setuptools import Extension
 from setuptools import setup
 
 
 # =====
+def _find_sources(suffix: str) -> List[str]:
+    sources: List[str] = []
+    for (root_path, _, names) in os.walk("src"):
+        for name in names:
+            if name.endswith(suffix):
+                sources.append(os.path.join(root_path, name))
+    return sources
+
+
 if __name__ == "__main__":
     setup(
         name="ustreamer",
@@ -18,8 +29,8 @@ if __name__ == "__main__":
                 "ustreamer",
                 libraries=["rt", "m", "pthread"],
                 undef_macros=["NDEBUG"],
-                sources=["src/" + name for name in os.listdir("src") if name.endswith(".c")],
+                sources=_find_sources(".c"),
-                depends=["src/" + name for name in os.listdir("src") if name.endswith(".h")],
+                depends=_find_sources(".h"),
             ),
         ],
     )

python/src/frame.c

@@ -1 +0,0 @@
-../../src/libs/frame.c

python/src/frame.h

@@ -1 +0,0 @@
-../../src/libs/frame.h

python/src/memsinksh.h

@@ -1 +0,0 @@
-../../src/libs/memsinksh.h

python/src/tools.h

@@ -1 +0,0 @@
-../../src/libs/tools.h

python/src/uslibs/frame.c

@@ -0,0 +1 @@
+../../../src/libs/frame.c

python/src/uslibs/frame.h

@@ -0,0 +1 @@
+../../../src/libs/frame.h

python/src/uslibs/memsinksh.h

@@ -0,0 +1 @@
+../../../src/libs/memsinksh.h

python/src/uslibs/tools.h

@@ -0,0 +1 @@
+../../../src/libs/tools.h

python/src/ustreamer.c

@@ -13,9 +13,9 @@
 
 #include <Python.h>
 
-#include "tools.h"
+#include "uslibs/tools.h"
-#include "frame.h"
+#include "uslibs/frame.h"
-#include "memsinksh.h"
+#include "uslibs/memsinksh.h"
 
 
 typedef struct {