Restyle refactor: Make ToxAV independent of toxcore internals.

.cirrus.yml

@@ -7,10 +7,11 @@ cirrus-ci_task:
   configure_script:
     - /src/workspace/tools/inject-repo c-toxcore
   test_all_script:
-    - bazel test -k
+    - TEST="bazel test -k
       --build_tag_filters=-haskell
       --test_tag_filters=-haskell
       --remote_download_minimal
       --config=ci
       --config=release
-      //c-toxcore/...
+      //c-toxcore/..."
+    - $TEST || $TEST || $TEST || $TEST

.restyled.yaml

@@ -1,4 +1,7 @@
 ---
+exclude:
+  - "**/*.api.h"
+
 restylers:
   - astyle:
       arguments: ["--options=other/astyle/astylerc"]

CMakeLists.txt

@@ -268,6 +268,7 @@ if(BUILD_TOXAV)
     toxav/rtp.h
     toxav/toxav.c
     toxav/toxav.h
+    toxav/toxav_hacks.h
     toxav/toxav_old.c
     toxav/video.c
     toxav/video.h)

other/analysis/run-clang

@@ -3,23 +3,24 @@
 . other/analysis/gen-file.sh
 
 echo "Running Clang compiler"
-clang++ -o /dev/null amalgamation.cc		\
-	$CPPFLAGS				\
-	$LDFLAGS				\
-	-std=c++11				\
-	-Werror					\
-	-Weverything				\
-	-Wno-c++98-compat-pedantic		\
-	-Wno-c99-extensions			\
-	-Wno-cast-align				\
-	-Wno-conversion				\
-	-Wno-covered-switch-default		\
-	-Wno-disabled-macro-expansion		\
-	-Wno-documentation-deprecated-sync	\
-	-Wno-missing-field-initializers		\
-	-Wno-old-style-cast			\
-	-Wno-padded				\
-	-Wno-sign-compare			\
-	-Wno-unreachable-code-return		\
-	-Wno-unused-parameter			\
-	-Wno-used-but-marked-unused		\
+clang++ -o /dev/null amalgamation.cc \
+  "$CPPFLAGS" \
+  "$LDFLAGS" \
+  -std=c++11 \
+  -Werror \
+  -Weverything \
+  -Wno-c++98-compat-pedantic \
+  -Wno-c99-extensions \
+  -Wno-cast-align \
+  -Wno-conversion \
+  -Wno-covered-switch-default \
+  -Wno-disabled-macro-expansion \
+  -Wno-documentation-deprecated-sync \
+  -Wno-missing-field-initializers \
+  -Wno-old-style-cast \
+  -Wno-padded \
+  -Wno-sign-compare \
+  -Wno-unreachable-code-return \
+  -Wno-unused-parameter \
+  -Wno-used-but-marked-unused \
+  -fdiagnostics-color=always

toxav/BUILD.bazel

@@ -29,99 +29,46 @@ cc_test(
     ],
 )
 
-cc_library(
-    name = "ring_buffer_srcs",
-    hdrs = [
-        "ring_buffer.c",
-        "ring_buffer.h",
-    ],
-    visibility = ["//c-toxcore/testing:__pkg__"],
-    deps = ["//c-toxcore/toxcore:ccompat"],
-)
-
-cc_library(
-    name = "bwcontroller",
-    srcs = ["bwcontroller.c"],
-    hdrs = ["bwcontroller.h"],
-    deps = [
-        ":ring_buffer",
-        "//c-toxcore/toxcore",
-        "//c-toxcore/toxcore:Messenger",
-    ],
-)
-
-cc_library(
-    name = "rtp",
-    srcs = ["rtp.c"],
-    hdrs = ["rtp.h"],
-    deps = [":bwcontroller"],
-)
-
 cc_test(
     name = "rtp_test",
     size = "small",
     srcs = ["rtp_test.cc"],
     deps = [
-        ":rtp",
+        ":toxav",
         "//c-toxcore/toxcore:crypto_core",
         "@com_google_googletest//:gtest_main",
     ],
 )
 
-cc_library(
-    name = "audio",
-    srcs = ["audio.c"],
-    hdrs = ["audio.h"],
-    deps = [
-        ":public",
-        ":rtp",
-        "//c-toxcore/toxcore:network",
-        "@opus",
-    ],
-)
-
-cc_library(
-    name = "video",
-    srcs = [
-        "msi.c",
-        "video.c",
-    ],
-    hdrs = [
-        "msi.h",
-        "video.h",
-    ],
-    deps = [
-        ":audio",
-        ":public",
-        "//c-toxcore/toxcore:network",
-        "@libvpx",
-    ],
-)
-
-cc_library(
-    name = "groupav",
-    srcs = ["groupav.c"],
-    hdrs = ["groupav.h"],
-    deps = [
-        "//c-toxcore/toxcore",
-        "@opus",
-    ],
-)
-
 cc_library(
     name = "toxav",
     srcs = [
+        "audio.c",
+        "bwcontroller.c",
+        "groupav.c",
+        "msi.c",
+        "rtp.c",
         "toxav.c",
         "toxav_old.c",
+        "video.c",
     ],
     hdrs = [
+        "audio.h",
+        "bwcontroller.h",
+        "groupav.h",
+        "msi.h",
+        "rtp.h",
         "toxav.api.h",
         "toxav.h",
+        "toxav_hacks.h",
+        "video.h",
     ],
     visibility = ["//c-toxcore:__subpackages__"],
     deps = [
-        ":groupav",
-        ":video",
+        ":ring_buffer",
+        "//c-toxcore/toxcore",
+        "@libvpx",
+        "@opus",
     ],
 )
 

toxav/Makefile.inc

@@ -19,6 +19,7 @@ libtoxav_la_SOURCES = ../toxav/rtp.h \
                     ../toxav/ring_buffer.h \
                     ../toxav/ring_buffer.c \
                     ../toxav/toxav.h \
+                    ../toxav/toxav_hacks.h \
                     ../toxav/toxav.c \
                     ../toxav/toxav_old.c