From 1bf1497855d0d4eb49b279da3951b05243dee1b6 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 30 Mar 2022 17:22:26 +0200
Subject: [PATCH] spa: mode dll to utils

---
 spa/{plugins/alsa => include/spa/utils}/dll.h | 2 +-
 spa/plugins/alsa/alsa-pcm.h                   | 2 +-
 spa/plugins/alsa/alsa-seq.c                   | 1 -
 spa/plugins/alsa/alsa-seq.h                   | 2 +-
 spa/plugins/alsa/meson.build                  | 2 +-
 spa/plugins/alsa/test-timer.c                 | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename spa/{plugins/alsa => include/spa/utils}/dll.h (98%)

diff --git a/spa/plugins/alsa/dll.h b/spa/include/spa/utils/dll.h
similarity index 98%
rename from spa/plugins/alsa/dll.h
rename to spa/include/spa/utils/dll.h
index 5b11d6f4f..65d8cd61d 100644
--- a/spa/plugins/alsa/dll.h
+++ b/spa/include/spa/utils/dll.h
@@ -47,7 +47,7 @@ static inline void spa_dll_init(struct spa_dll *dll)
 	dll->z1 = dll->z2 = dll->z3 = 0.0;
 }
 
-static inline void spa_dll_set_bw(struct spa_dll *dll, double bw, uint32_t period, uint32_t rate)
+static inline void spa_dll_set_bw(struct spa_dll *dll, double bw, unsigned period, unsigned rate)
 {
 	double w = 2 * M_PI * bw * period / rate;
 	dll->w0 = 1.0 - exp (-20.0 * w);
diff --git a/spa/plugins/alsa/alsa-pcm.h b/spa/plugins/alsa/alsa-pcm.h
index acff0a287..28d18243d 100644
--- a/spa/plugins/alsa/alsa-pcm.h
+++ b/spa/plugins/alsa/alsa-pcm.h
@@ -39,6 +39,7 @@ extern "C" {
 #include <spa/support/loop.h>
 #include <spa/utils/list.h>
 #include <spa/utils/json.h>
+#include <spa/utils/dll.h>
 
 #include <spa/node/node.h>
 #include <spa/node/utils.h>
@@ -50,7 +51,6 @@ extern "C" {
 
 #include "alsa.h"
 
-#include "dll.h"
 
 #define MAX_RATES	16
 
diff --git a/spa/plugins/alsa/alsa-seq.c b/spa/plugins/alsa/alsa-seq.c
index f7634f25c..55f84b5ca 100644
--- a/spa/plugins/alsa/alsa-seq.c
+++ b/spa/plugins/alsa/alsa-seq.c
@@ -39,7 +39,6 @@
 
 #include "alsa.h"
 
-#include "dll.h"
 #include "alsa-seq.h"
 
 #define CHECK(s,msg,...) if ((res = (s)) < 0) { spa_log_error(state->log, msg ": %s", ##__VA_ARGS__, snd_strerror(res)); return res; }
diff --git a/spa/plugins/alsa/alsa-seq.h b/spa/plugins/alsa/alsa-seq.h
index ec1dece4d..91f763e24 100644
--- a/spa/plugins/alsa/alsa-seq.h
+++ b/spa/plugins/alsa/alsa-seq.h
@@ -37,6 +37,7 @@ extern "C" {
 #include <spa/support/plugin.h>
 #include <spa/support/loop.h>
 #include <spa/utils/list.h>
+#include <spa/utils/dll.h>
 
 #include <spa/node/node.h>
 #include <spa/node/utils.h>
@@ -47,7 +48,6 @@ extern "C" {
 
 #include "alsa.h"
 
-#include "dll.h"
 
 struct props {
 	char device[64];
diff --git a/spa/plugins/alsa/meson.build b/spa/plugins/alsa/meson.build
index e3fa6f0d7..058413987 100644
--- a/spa/plugins/alsa/meson.build
+++ b/spa/plugins/alsa/meson.build
@@ -37,7 +37,7 @@ executable('spa-acp-tool',
 
 executable('test-timer',
   [ 'test-timer.c' ],
-  dependencies : [ alsa_dep, mathlib, epoll_shim_dep ],
+  dependencies : [ spa_dep, alsa_dep, mathlib, epoll_shim_dep ],
   install : false,
 )
 
diff --git a/spa/plugins/alsa/test-timer.c b/spa/plugins/alsa/test-timer.c
index 4d77e02e4..0f403dc22 100644
--- a/spa/plugins/alsa/test-timer.c
+++ b/spa/plugins/alsa/test-timer.c
@@ -31,7 +31,7 @@
 
 #include <alsa/asoundlib.h>
 
-#include <dll.h>
+#include <spa/utils/dll.h>
 
 #define DEFAULT_DEVICE	"hw:0"