From f37aff1452ce6ba3cbf02abed72a51811cea5ab7 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Sat, 20 Sep 2025 20:55:10 +0200
Subject: [PATCH 01/26] sip: fix session hangup handling

---
 src/sip.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/src/sip.c b/src/sip.c
index 3583791..2a013df 100644
--- a/src/sip.c
+++ b/src/sip.c
@@ -1,7 +1,27 @@
-#include <assert.h>
 #include <mix.h>
 
 static struct ua *sip_ua;
+static struct list sip_sessl = LIST_INIT;
+
+struct sip_sess_e {
+	struct le le;
+	struct call *call;
+	struct session *sess;
+};
+
+
+static void destruct_sess_e(void *arg)
+{
+	struct sip_sess_e *e = arg;
+
+	char *json = NULL;
+	user_event_json(&json, USER_DELETED, e->sess);
+	sl_ws_send_event(e->sess, json);
+	mem_deref(json);
+
+	list_unlink(&e->le);
+	mem_deref(e->sess);
+}
 
 
 static void ua_event_handler(enum bevent_ev ev, struct bevent *event,
@@ -10,6 +30,8 @@ static void ua_event_handler(enum bevent_ev ev, struct bevent *event,
 	struct mix *mix		  = arg;
 	struct call *call	  = bevent_get_call(event);
 	const struct sip_msg *msg = bevent_get_msg(event);
+	struct sip_sess_e *e	  = NULL;
+	int err			  = 0;
 
 	switch (ev) {
 
@@ -28,8 +50,21 @@ static void ua_event_handler(enum bevent_ev ev, struct bevent *event,
 
 		pl_set_str(&peer_pl, peer);
 
-		slmix_session_alloc(&sess, mix, NULL, NULL, &peer_pl, false,
-				    true);
+		err = slmix_session_alloc(&sess, mix, NULL, NULL, &peer_pl,
+					  false, true);
+		if (err)
+			goto hangup;
+
+		e = mem_zalloc(sizeof(struct sip_sess_e), destruct_sess_e);
+		if (!e) {
+			mem_deref(sess);
+			goto hangup;
+		}
+
+		e->call = call;
+		e->sess = sess;
+
+		list_append(&sip_sessl, &e->le, e);
 
 		pl_strcpy(&peer_pl, sess->user->id, sizeof(sess->user->id));
 
@@ -50,18 +85,34 @@ static void ua_event_handler(enum bevent_ev ev, struct bevent *event,
 
 		slmix_disp_enable(mix, peer, true);
 
+
 		slmix_source_append_all(mix, call, peer);
 
 		break;
 
 	case BEVENT_CALL_CLOSED: {
 		slmix_source_deref(mix, call, NULL);
+		struct le *le;
+		struct le *le_tmp;
+		LIST_FOREACH_SAFE(&sip_sessl, le, le_tmp)
+		{
+			e = le->data;
+
+			if (e->call != call)
+				continue;
+
+			mem_deref(e);
+		}
 
 		break;
 	}
 	default:
 		break;
 	}
+
+	return;
+hangup:
+	call_hangup(call, 500, "Server Error");
 }
 
 

From 5fcb40060e44a0086fccc9df66425e2e6c017e27 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Wed, 17 Sep 2025 18:04:40 +0200
Subject: [PATCH 02/26] sip: add pidx

---
 src/sip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sip.c b/src/sip.c
index 2a013df..f48e057 100644
--- a/src/sip.c
+++ b/src/sip.c
@@ -83,7 +83,7 @@ static void ua_event_handler(enum bevent_ev ev, struct bevent *event,
 		sess->connected	  = true;
 		sess->user->video = true;
 
-		slmix_disp_enable(mix, peer, true);
+		sess->user->pidx = slmix_disp_enable(mix, peer, true);
 
 
 		slmix_source_append_all(mix, call, peer);

From 51e9986bb6eb4d4d5fde7f3793b8c7b312688480 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Tue, 16 Sep 2025 17:53:44 +0200
Subject: [PATCH 03/26] enable source view

---
 src/sess.c                           | 2 +-
 webui/src/components/WebrtcVideo.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sess.c b/src/sess.c
index 0a2d1f8..0be72c1 100644
--- a/src/sess.c
+++ b/src/sess.c
@@ -138,7 +138,7 @@ static void pc_estab_handler(struct media_track *media, void *arg)
 		stream_enable_tx(media_get_stream(media), true);
 
 /* Enable/Disable Source view */
-#if 0
+#if 1
 		if (!sess->user->host)
 			slmix_source_append_all(sess->mix, NULL,
 						sess->user->id);
diff --git a/webui/src/components/WebrtcVideo.vue b/webui/src/components/WebrtcVideo.vue
index 05c38f3..38a67ba 100644
--- a/webui/src/components/WebrtcVideo.vue
+++ b/webui/src/components/WebrtcVideo.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex">
-    <div v-show="Webrtc.state.value >= WebrtcState.Listening" class="w-1/3 mr-2 hidden">
+    <div v-show="Webrtc.state.value >= WebrtcState.Listening" class="w-1/3 mr-2">
       <div v-for="item in sources" class="my-1">
         <video :id="'source' + item.rtc?.id" playsinline autoplay muted preload="none"></video>
         <div>

From 3ac83d25b87189ed27e4e1d76f14aad8d522674c Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Tue, 16 Sep 2025 17:14:43 +0200
Subject: [PATCH 04/26] podstock 2025 changes

- remove turn
- change framerate
- change bitrate
---
 src/main.c          |  8 ++++----
 webui/src/webrtc.ts | 12 ++----------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/main.c b/src/main.c
index 8927619..6d74ae1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -118,7 +118,7 @@ int main(int argc, char *const argv[])
 	struct mix *mix = slmix();
 
 	const char *conf =
-		"#sip_listen		0.0.0.0:5060\n"
+		"sip_listen		0.0.0.0:5060\n"
 		"call_max_calls		10\n" /* SIP incoming only */
 		"sip_verify_server	yes\n"
 		"audio_buffer		40-100\n"
@@ -132,10 +132,10 @@ int main(int argc, char *const argv[])
 		"opus_bitrate		64000\n"
 		"ice_policy		all\n"
 		"video_size		1920x1080\n"
-		"video_bitrate		2500000\n"
-		"video_sendrate		10000000\n" /* max burst send */
+		"video_bitrate		4500000\n"
+		"video_sendrate		30000000\n" /* max burst send */
 		"video_burst_bit	1000000\n"  /* max burst send */
-		"video_fps		24\n"
+		"video_fps		30\n"
 		"avcodec_keyint		10\n"
 		"avcodec_h265enc	nil\n"
 		"avcodec_h265dec	nil\n"
diff --git a/webui/src/webrtc.ts b/webui/src/webrtc.ts
index b29d032..be672e6 100644
--- a/webui/src/webrtc.ts
+++ b/webui/src/webrtc.ts
@@ -40,15 +40,7 @@ const constraintsVideo: any = {
 const configuration: RTCConfiguration = {
     bundlePolicy: 'balanced',
 
-    iceTransportPolicy: 'relay',
-    iceServers: [
-        {
-            urls: 'turn:167.235.37.175:3478',
-            username: 'turn200301',
-            credential: 'choh4zeem3foh1',
-        },
-    ],
-
+    iceTransportPolicy: 'all',
 
     /* default on Firefox/Chrome but needed by Safari */
     rtcpMuxPolicy: 'require'
@@ -202,7 +194,7 @@ async function pc_setup() {
 
     pc.onicecandidate = async (event) => {
         console.log('webrtc/icecandidate: ' + event.candidate?.type + ' IP: ' + event.candidate?.candidate, event)
-        if (event.candidate?.type != "relay")
+        if (event.candidate?.type != "host")
             return
 
         if (event.candidate?.component != "rtp")

From 510d722f7fbd1b7cc511a497efa7817b285c2e4d Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Sun, 29 Mar 2026 14:27:04 +0200
Subject: [PATCH 05/26] use h264

---
 modules/vmix/codec.c | 2 +-
 src/main.c           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/vmix/codec.c b/modules/vmix/codec.c
index 4cdbafc..5ed572b 100644
--- a/modules/vmix/codec.c
+++ b/modules/vmix/codec.c
@@ -457,7 +457,7 @@ int vmix_codec_init(void)
 	if (err)
 		return err;
 
-#if 0
+#if 1
 	proxy_codec_alloc("H264", "packetization-mode=0");
 	proxy_codec_alloc("H264", "packetization-mode=1");
 #else
diff --git a/src/main.c b/src/main.c
index 6d74ae1..ae2deb3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -13,7 +13,7 @@ static const char *modv[] = {
 	"auresamp",
 
 	/* video */
-	"vp8",
+	/*"vp8", */
 	"avcodec",
 	"vmix",
 };

From c1de53019b7bbf2bce4096037ca2f2731fc1d36b Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Mon, 30 Mar 2026 09:08:55 +0200
Subject: [PATCH 06/26] wip: stats logging

---
 include/mix.h    |   3 +-
 src/http.c       |  13 +---
 src/stats.c      | 166 ++++++++++++++++++++++++++++-------------------
 webui/src/api.ts |   2 +-
 4 files changed, 105 insertions(+), 79 deletions(-)

diff --git a/include/mix.h b/include/mix.h
index 5732148..e15c972 100644
--- a/include/mix.h
+++ b/include/mix.h
@@ -1,7 +1,7 @@
 #include <re.h>
 #include <baresip.h>
 
-#define METRICS_URL "http://127.0.0.1:9091/metrics/job/rtc"
+#define METRICS_URL "http://127.0.0.1:6969/push/atrium"
 
 enum {
 	ROOM_SZ	   = 128,
@@ -281,6 +281,7 @@ int slmix_handle_ice_candidate(struct peer_connection *pc,
 /******************************************************************************
  * stats.c
  */
+int sl_mix_stats_append(struct mbuf *mb);
 int slmix_stats_init(void);
 void slmix_stats_close(void);
 
diff --git a/src/http.c b/src/http.c
index ebd42dd..163c91b 100644
--- a/src/http.c
+++ b/src/http.c
@@ -721,18 +721,7 @@ static void http_req_handler(struct http_conn *conn,
 			    METRICS_URL "/instance/%s/user/%s", mix->room,
 			    sess->user->id);
 
-		struct mbuf *body = mbuf_alloc(mbuf_get_left(msg->mb));
-		mbuf_write_mem(body, mbuf_buf(msg->mb),
-			       mbuf_get_left(msg->mb));
-
-		struct pl header_gzip;
-		pl_set_str(&header_gzip, "Content-Encoding: gzip");
-		http_reqconn_add_header(http_conn->conn, &header_gzip);
-
-		err = sl_httpc_req(http_conn, SL_HTTP_POST, metric_url, body);
-		mem_deref(http_conn);
-		mem_deref(body);
-
+		err = sl_mix_stats_append(msg->mb);
 		if (err)
 			goto err;
 
diff --git a/src/stats.c b/src/stats.c
index 76a23fb..fa3cb51 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -5,6 +5,7 @@ static struct tmr tmr_jitter;
 static uint64_t jitter_last = 0;
 static int64_t max_jitter   = 0; /* Mainloop jitter */
 enum { JITTER_INTERVAL = 10 };
+static struct mbuf *mb_stats;
 
 
 static void jitter_stats(void *arg)
@@ -37,15 +38,10 @@ static void slmix_metrics(void *arg)
 	(void)arg;
 	struct mix *mix = slmix();
 
-	struct mbuf *mb = mbuf_alloc(512);
-	if (!mb)
-		goto out;
-
-	re_snprintf(metric_url, sizeof(metric_url), METRICS_URL "/instance/%s",
-		    mix->room);
+	re_snprintf(metric_url, sizeof(metric_url), METRICS_URL, mix->room);
 
-	mbuf_printf(mb, "# TYPE mix_jitter gauge\n");
-	mbuf_printf(mb, "mix_jitter %lld\n", max_jitter);
+	mbuf_printf(mb_stats, "# TYPE mix_jitter gauge\n");
+	mbuf_printf(mb_stats, "mix_jitter %lld\n", max_jitter);
 	max_jitter = 0;
 
 	LIST_FOREACH(&mix->sessl, le)
@@ -60,57 +56,77 @@ static void slmix_metrics(void *arg)
 			    sess->user->id);
 
 		if (types) {
-			mbuf_printf(mb, "# TYPE mix_rtt gauge\n");
-			mbuf_printf(mb, "# TYPE mix_tx_sent counter\n");
-			mbuf_printf(mb, "# TYPE mix_tx_lost counter\n");
-			mbuf_printf(mb, "# TYPE mix_tx_jit gauge\n");
-			mbuf_printf(mb, "# TYPE mix_rx_sent counter\n");
-			mbuf_printf(mb, "# TYPE mix_rx_lost counter\n");
-			mbuf_printf(mb, "# TYPE mix_rx_jit gauge\n");
-			mbuf_printf(mb, "# TYPE mix_jbuf_delay gauge\n");
-			mbuf_printf(mb, "# TYPE mix_jbuf_skew gauge\n");
-			mbuf_printf(mb, "# TYPE mix_jbuf_late counter\n");
-			mbuf_printf(mb, "# TYPE mix_jbuf_late_lost counter\n");
-			mbuf_printf(mb, "# TYPE mix_jbuf_lost counter\n");
-			mbuf_printf(mb, "# TYPE mix_jbuf_gnacks counter\n");
-			mbuf_printf(mb, "# TYPE mix_jbuf_jitter gauge\n");
-			mbuf_printf(mb, "# TYPE mix_jbuf_packets gauge\n");
+			mbuf_printf(mb_stats, "# TYPE mix_rtt gauge\n");
+			mbuf_printf(mb_stats, "# TYPE mix_tx_sent counter\n");
+			mbuf_printf(mb_stats, "# TYPE mix_tx_lost counter\n");
+			mbuf_printf(mb_stats, "# TYPE mix_tx_jit gauge\n");
+			mbuf_printf(mb_stats, "# TYPE mix_rx_sent counter\n");
+			mbuf_printf(mb_stats, "# TYPE mix_rx_lost counter\n");
+			mbuf_printf(mb_stats, "# TYPE mix_rx_jit gauge\n");
+			mbuf_printf(mb_stats, "# TYPE mix_jbuf_delay gauge\n");
+			mbuf_printf(mb_stats, "# TYPE mix_jbuf_skew gauge\n");
+			mbuf_printf(mb_stats,
+				    "# TYPE mix_jbuf_late counter\n");
+			mbuf_printf(mb_stats,
+				    "# TYPE mix_jbuf_late_lost counter\n");
+			mbuf_printf(mb_stats,
+				    "# TYPE mix_jbuf_lost counter\n");
+			mbuf_printf(mb_stats,
+				    "# TYPE mix_jbuf_gnacks counter\n");
+			mbuf_printf(mb_stats,
+				    "# TYPE mix_jbuf_jitter gauge\n");
+			mbuf_printf(mb_stats,
+				    "# TYPE mix_jbuf_packets gauge\n");
 			types = false;
 		}
 
 		audio_stat = stream_rtcp_stats(media_get_stream(sess->maudio));
 		if (audio_stat) {
-			mbuf_printf(mb, "mix_rtt{%s,kind=\"audio\"} %u\n",
-				    labels, audio_stat->rtt / 1000);
-			mbuf_printf(mb, "mix_tx_sent{%s,kind=\"audio\"} %u\n",
+			mbuf_printf(mb_stats,
+				    "mix_rtt{%s,kind=\"audio\"} %u\n", labels,
+				    audio_stat->rtt / 1000);
+			mbuf_printf(mb_stats,
+				    "mix_tx_sent{%s,kind=\"audio\"} %u\n",
 				    labels, audio_stat->tx.sent);
-			mbuf_printf(mb, "mix_tx_lost{%s,kind=\"audio\"} %d\n",
+			mbuf_printf(mb_stats,
+				    "mix_tx_lost{%s,kind=\"audio\"} %d\n",
 				    labels, audio_stat->tx.lost);
-			mbuf_printf(mb, "mix_tx_jit{%s,kind=\"audio\"} %u\n",
+			mbuf_printf(mb_stats,
+				    "mix_tx_jit{%s,kind=\"audio\"} %u\n",
 				    labels, audio_stat->tx.jit);
-			mbuf_printf(mb, "mix_rx_sent{%s,kind=\"audio\"} %u\n",
+			mbuf_printf(mb_stats,
+				    "mix_rx_sent{%s,kind=\"audio\"} %u\n",
 				    labels, audio_stat->rx.sent);
-			mbuf_printf(mb, "mix_rx_lost{%s,kind =\"audio\"} %d\n",
+			mbuf_printf(mb_stats,
+				    "mix_rx_lost{%s,kind =\"audio\"} %d\n",
 				    labels, audio_stat->rx.lost);
-			mbuf_printf(mb, "mix_rx_jit{%s,kind=\"audio\"} %u\n",
+			mbuf_printf(mb_stats,
+				    "mix_rx_jit{%s,kind=\"audio\"} %u\n",
 				    labels, audio_stat->rx.jit);
 		}
 
 		video_stat = stream_rtcp_stats(media_get_stream(sess->mvideo));
 		if (video_stat) {
-			mbuf_printf(mb, "mix_rtt{%s,kind=\"video\"} %u\n",
-				    labels, video_stat->rtt / 1000);
-			mbuf_printf(mb, "mix_tx_sent{%s,kind=\"video\"} %u\n",
+			mbuf_printf(mb_stats,
+				    "mix_rtt{%s,kind=\"video\"} %u\n", labels,
+				    video_stat->rtt / 1000);
+			mbuf_printf(mb_stats,
+				    "mix_tx_sent{%s,kind=\"video\"} %u\n",
 				    labels, video_stat->tx.sent);
-			mbuf_printf(mb, "mix_tx_lost{%s,kind=\"video\"} %d\n",
+			mbuf_printf(mb_stats,
+				    "mix_tx_lost{%s,kind=\"video\"} %d\n",
 				    labels, video_stat->tx.lost);
-			mbuf_printf(mb, "mix_tx_jit{%s,kind=\"video\"} %u\n",
+			mbuf_printf(mb_stats,
+				    "mix_tx_jit{%s,kind=\"video\"} %u\n",
 				    labels, video_stat->tx.jit);
-			mbuf_printf(mb, "mix_rx_sent{%s,kind=\"video\"} %u\n",
+			mbuf_printf(mb_stats,
+				    "mix_rx_sent{%s,kind=\"video\"} %u\n",
 				    labels, video_stat->rx.sent);
-			mbuf_printf(mb, "mix_rx_lost{%s,kind=\"video\"} %d\n",
+			mbuf_printf(mb_stats,
+				    "mix_rx_lost{%s,kind=\"video\"} %d\n",
 				    labels, video_stat->rx.lost);
-			mbuf_printf(mb, "mix_rx_jit{%s,kind=\"video\"} %u\n",
+			mbuf_printf(mb_stats,
+				    "mix_rx_jit{%s,kind=\"video\"} %u\n",
 				    labels, video_stat->rx.jit);
 		}
 
@@ -121,57 +137,72 @@ static void slmix_metrics(void *arg)
 		if (err)
 			continue;
 
-		mbuf_printf(mb, "mix_jbuf_delay{%s,kind=\"audio\"} %u\n",
+		mbuf_printf(mb_stats, "mix_jbuf_delay{%s,kind=\"audio\"} %u\n",
 			    labels, audio_jstat.c_delay);
-		mbuf_printf(mb, "mix_jbuf_skew{%s,kind=\"audio\"} %d\n",
+		mbuf_printf(mb_stats, "mix_jbuf_skew{%s,kind=\"audio\"} %d\n",
 			    labels, audio_jstat.c_skew);
-		mbuf_printf(mb, "mix_jbuf_late{%s,kind=\"audio\"} %u\n",
+		mbuf_printf(mb_stats, "mix_jbuf_late{%s,kind=\"audio\"} %u\n",
 			    labels, audio_jstat.n_late);
-		mbuf_printf(mb, "mix_jbuf_late_lost{%s,kind=\"audio\"} %u\n",
+		mbuf_printf(mb_stats,
+			    "mix_jbuf_late_lost{%s,kind=\"audio\"} %u\n",
 			    labels, audio_jstat.n_late_lost);
-		mbuf_printf(mb, "mix_jbuf_lost{%s,kind=\"audio\"} %u\n",
+		mbuf_printf(mb_stats, "mix_jbuf_lost{%s,kind=\"audio\"} %u\n",
 			    labels, audio_jstat.n_lost);
-		mbuf_printf(mb, "mix_jbuf_jitter{%s,kind=\"audio\"} %u\n",
-			    labels, audio_jstat.c_jitter);
-		mbuf_printf(mb, "mix_jbuf_packets{%s,kind=\"audio\"} %u\n",
-			    labels, audio_jstat.c_packets);
-		mbuf_printf(mb, "mix_jbuf_gnacks{%s,kind=\"audio\"} %u\n",
-			    labels, audio_jstat.n_gnacks);
-
-		mbuf_printf(mb, "mix_jbuf_delay{%s,kind=\"video\"} %u\n",
+		mbuf_printf(mb_stats,
+			    "mix_jbuf_jitter{%s,kind=\"audio\"} %u\n", labels,
+			    audio_jstat.c_jitter);
+		mbuf_printf(mb_stats,
+			    "mix_jbuf_packets{%s,kind=\"audio\"} %u\n", labels,
+			    audio_jstat.c_packets);
+		mbuf_printf(mb_stats,
+			    "mix_jbuf_gnacks{%s,kind=\"audio\"} %u\n", labels,
+			    audio_jstat.n_gnacks);
+
+		mbuf_printf(mb_stats, "mix_jbuf_delay{%s,kind=\"video\"} %u\n",
 			    labels, video_jstat.c_delay);
-		mbuf_printf(mb, "mix_jbuf_skew{%s,kind=\"video\"} %d\n",
+		mbuf_printf(mb_stats, "mix_jbuf_skew{%s,kind=\"video\"} %d\n",
 			    labels, video_jstat.c_skew);
-		mbuf_printf(mb, "mix_jbuf_late{%s,kind=\"video\"} %u\n",
+		mbuf_printf(mb_stats, "mix_jbuf_late{%s,kind=\"video\"} %u\n",
 			    labels, video_jstat.n_late);
-		mbuf_printf(mb, "mix_jbuf_late_lost{%s,kind=\"video\"} %u\n",
+		mbuf_printf(mb_stats,
+			    "mix_jbuf_late_lost{%s,kind=\"video\"} %u\n",
 			    labels, video_jstat.n_late_lost);
-		mbuf_printf(mb, "mix_jbuf_lost{%s,kind=\"video\"} %u\n",
+		mbuf_printf(mb_stats, "mix_jbuf_lost{%s,kind=\"video\"} %u\n",
 			    labels, video_jstat.n_lost);
-		mbuf_printf(mb, "mix_jbuf_jitter{%s,kind=\"video\"} %u\n",
-			    labels, video_jstat.c_jitter);
-		mbuf_printf(mb, "mix_jbuf_packets{%s,kind=\"video\"} %u\n",
-			    labels, video_jstat.c_packets);
-		mbuf_printf(mb, "mix_jbuf_gnacks{%s,kind=\"video\"} %u\n",
-			    labels, video_jstat.n_gnacks);
+		mbuf_printf(mb_stats,
+			    "mix_jbuf_jitter{%s,kind=\"video\"} %u\n", labels,
+			    video_jstat.c_jitter);
+		mbuf_printf(mb_stats,
+			    "mix_jbuf_packets{%s,kind=\"video\"} %u\n", labels,
+			    video_jstat.c_packets);
+		mbuf_printf(mb_stats,
+			    "mix_jbuf_gnacks{%s,kind=\"video\"} %u\n", labels,
+			    video_jstat.n_gnacks);
 	}
 
-	if (mbuf_pos(mb) == 0)
+	if (mbuf_pos(mb_stats) == 0)
 		goto out;
 
 	err = sl_httpc_alloc(&http_conn, NULL, NULL, NULL);
 	if (err)
 		goto out;
 
-	sl_httpc_req(http_conn, SL_HTTP_POST, metric_url, mb);
+	sl_httpc_req(http_conn, SL_HTTP_POST, metric_url, mb_stats);
 	mem_deref(http_conn);
 
+	mbuf_rewind(mb_stats);
+
 out:
-	mem_deref(mb);
 	tmr_start(&tmr_metrics, 2000, slmix_metrics, NULL);
 }
 
 
+int sl_mix_stats_append(struct mbuf *mb)
+{
+	return mbuf_write_mem(mb_stats, mbuf_buf(mb), mbuf_get_left(mb));
+}
+
+
 int slmix_stats_init(void)
 {
 	tmr_init(&tmr_metrics);
@@ -179,6 +210,10 @@ int slmix_stats_init(void)
 	tmr_start(&tmr_metrics, 2000, slmix_metrics, NULL);
 	tmr_start(&tmr_jitter, JITTER_INTERVAL, jitter_stats, NULL);
 
+	mb_stats = mbuf_alloc(512);
+	if (!mb_stats)
+		return ENOMEM;
+
 	return 0;
 }
 
@@ -187,4 +222,5 @@ void slmix_stats_close(void)
 {
 	tmr_cancel(&tmr_metrics);
 	tmr_cancel(&tmr_jitter);
+	mb_stats = mem_deref(mb_stats);
 }
diff --git a/webui/src/api.ts b/webui/src/api.ts
index 02ad0b9..0511bcc 100644
--- a/webui/src/api.ts
+++ b/webui/src/api.ts
@@ -167,7 +167,7 @@ export default {
 
         const blob = await compressedResponse.blob();
 
-        await api_fetch('POST', '/webrtc/stats', blob, false, true)
+        await api_fetch('POST', '/webrtc/stats', data, false, true)
     },
 
     async record_switch(type: RecordType) {

From d5b772d278fc1b09b3642e528fe18269e021e67e Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Mon, 30 Mar 2026 10:10:01 +0200
Subject: [PATCH 07/26] webui/webrtc/stats: fix user id

---
 webui/src/webrtc.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webui/src/webrtc.ts b/webui/src/webrtc.ts
index be672e6..e1e94ea 100644
--- a/webui/src/webrtc.ts
+++ b/webui/src/webrtc.ts
@@ -149,6 +149,7 @@ async function pc_stats(pc: RTCPeerConnection | null) {
         }
 
         labels.push(`browser="${adapter.browserDetails.browser}"`);
+        labels.push(`user="${api.user_id()}"`);
 
         Object.entries(value).forEach(([key, v]: any) => {
             if (typeof v === "number") {

From 07e9d7983d26e33d71b17413a79656369a38833e Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Mon, 30 Mar 2026 10:17:24 +0200
Subject: [PATCH 08/26] mix/stats: push only if browser stats ready

---
 src/stats.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/stats.c b/src/stats.c
index fa3cb51..988b8c3 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -36,6 +36,10 @@ static void slmix_metrics(void *arg)
 	struct jbuf_stat video_jstat;
 	bool types = true;
 	(void)arg;
+
+	if (mbuf_pos(mb_stats) == 0)
+		goto out;
+
 	struct mix *mix = slmix();
 
 	re_snprintf(metric_url, sizeof(metric_url), METRICS_URL, mix->room);
@@ -180,8 +184,6 @@ static void slmix_metrics(void *arg)
 			    video_jstat.n_gnacks);
 	}
 
-	if (mbuf_pos(mb_stats) == 0)
-		goto out;
 
 	err = sl_httpc_alloc(&http_conn, NULL, NULL, NULL);
 	if (err)

From 6420d412d150119ee6a73023e39513d901562031 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Mon, 30 Mar 2026 10:44:10 +0200
Subject: [PATCH 09/26] mix/stats: fix sip call audio/video stats

---
 src/stats.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/stats.c b/src/stats.c
index 988b8c3..526fcc6 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -84,7 +84,19 @@ static void slmix_metrics(void *arg)
 			types = false;
 		}
 
-		audio_stat = stream_rtcp_stats(media_get_stream(sess->maudio));
+		struct stream *audio_stream;
+		struct stream *video_stream;
+
+		if (sess->call) {
+			audio_stream = audio_strm(call_audio(sess->call));
+			video_stream = video_strm(call_video(sess->call));
+		}
+		else {
+			audio_stream = media_get_stream(sess->maudio);
+			video_stream = media_get_stream(sess->mvideo);
+		}
+
+		audio_stat = stream_rtcp_stats(audio_stream);
 		if (audio_stat) {
 			mbuf_printf(mb_stats,
 				    "mix_rtt{%s,kind=\"audio\"} %u\n", labels,
@@ -109,7 +121,7 @@ static void slmix_metrics(void *arg)
 				    labels, audio_stat->rx.jit);
 		}
 
-		video_stat = stream_rtcp_stats(media_get_stream(sess->mvideo));
+		video_stat = stream_rtcp_stats(video_stream);
 		if (video_stat) {
 			mbuf_printf(mb_stats,
 				    "mix_rtt{%s,kind=\"video\"} %u\n", labels,
@@ -134,10 +146,8 @@ static void slmix_metrics(void *arg)
 				    labels, video_stat->rx.jit);
 		}
 
-		err = stream_jbuf_stats(media_get_stream(sess->maudio),
-					&audio_jstat);
-		err |= stream_jbuf_stats(media_get_stream(sess->mvideo),
-					 &video_jstat);
+		err = stream_jbuf_stats(audio_stream, &audio_jstat);
+		err |= stream_jbuf_stats(video_stream, &video_jstat);
 		if (err)
 			continue;
 

From 8f61e344c3e3d983d6e67fa4ab3aed7d0f56bed5 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Thu, 2 Apr 2026 11:50:01 +0200
Subject: [PATCH 10/26] webui/webrtc_source: add stats

---
 webui/src/webrtc_source.ts | 75 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/webui/src/webrtc_source.ts b/webui/src/webrtc_source.ts
index 04600ba..595ae18 100644
--- a/webui/src/webrtc_source.ts
+++ b/webui/src/webrtc_source.ts
@@ -7,6 +7,79 @@ const pc_configuration: RTCConfiguration = {
     iceTransportPolicy: 'all',
 };
 
+const QualityLimitationReasons = {
+    none: 0,
+    bandwidth: 1,
+    cpu: 2,
+    other: 3,
+};
+
+async function pc_stats(pc: RTCPeerConnection | null, id: number) {
+
+    if (!pc || pc.connectionState === 'closed')
+        return
+
+    const state = pc.connectionState
+
+    const stats = await pc.getStats()
+
+    // @ts-ignore
+    const values = [...stats.values()].filter(
+        (v) =>
+            ["peer-connection", "inbound-rtp", "outbound-rtp", "remote-inbound-rtp"].indexOf(v.type) !== -1,
+    );
+
+    let data = "";
+    const sentTypes = new Set();
+
+
+    values.forEach((value: any) => {
+        const type = value.type.replace(/-/g, "_");
+        const labels: any = [];
+        const metrics: any = [];
+
+        if (value.type === "peer-connection") {
+            labels.push(`state="${state}"`);
+        }
+
+        labels.push(`user="${api.user_id()}"`);
+        labels.push(`source="${id}"`);
+
+        Object.entries(value).forEach(([key, v]: any) => {
+            if (typeof v === "number") {
+                metrics.push([key, v]);
+            } else if (typeof v === "object") {
+                Object.entries(v).forEach(([subkey, subv]) => {
+                    if (typeof subv === "number") {
+                        metrics.push([`${key}_${subkey}`, subv]);
+                    }
+                });
+            } else if (
+                key === "qualityLimitationReason" &&
+                QualityLimitationReasons[v as keyof typeof QualityLimitationReasons] !== undefined
+            ) {
+                metrics.push([key, QualityLimitationReasons[v as keyof typeof QualityLimitationReasons]]);
+            } else {
+                labels.push(`${key}="${v}"`);
+            }
+        });
+
+        metrics.forEach(([key, v]: any) => {
+            const name = `${type}_${key.replace(/-/g, "_")}`;
+            let typeDesc = "";
+
+            if (!sentTypes.has(name)) {
+                typeDesc = `# TYPE ${name} gauge\n`;
+                sentTypes.add(name);
+            }
+            data += `${typeDesc}${name}{${labels.join(",")}} ${v}\n`;
+        });
+    });
+
+    await api.rtc_stats(data)
+    setTimeout(pc_stats, 5000, pc, id)
+}
+
 export class WebRTCSource {
     private pc: RTCPeerConnection
     public audio: MediaStream | null
@@ -44,6 +117,8 @@ export class WebRTCSource {
                 video.srcObject = this.video
                 video.play()
 
+                pc_stats(this.pc, this.id)
+
                 console.log("WebRTCSource: video track added")
             }
         }

From a7210fc82c27e8d3d3f3497e4c19eb85d768d81a Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Thu, 2 Apr 2026 15:08:17 +0200
Subject: [PATCH 11/26] wip: new tracks/api view

---
 CMakeLists.txt                                |   1 +
 include/mix.h                                 |  70 ++-
 src/chat.c                                    |   2 +-
 src/http.c                                    |  99 +++-
 src/main.c                                    |   4 +
 src/mix.c                                     |   2 +-
 src/sess.c                                    |   2 +-
 src/sip.c                                     |   8 +-
 src/source.c                                  |   2 +-
 src/tracks.c                                  | 429 ++++++++++++++++++
 src/ws.c                                      |  34 +-
 webui/index.html                              |   2 +-
 webui/src/api.ts                              |  22 +
 webui/src/components/Tracks/RemoteTrack.vue   |  86 ++++
 .../src/components/Tracks/RemoteTrackCall.vue | 100 ++++
 .../components/Tracks/RemoteTrackSettings.vue |  43 ++
 webui/src/components/Tracks/Tracks.vue        |  31 ++
 webui/src/index.css                           | 100 ++++
 webui/src/views/HomeView.vue                  |   6 +-
 webui/src/ws/tracks.ts                        | 196 ++++++++
 20 files changed, 1210 insertions(+), 29 deletions(-)
 create mode 100644 src/tracks.c
 create mode 100644 webui/src/components/Tracks/RemoteTrack.vue
 create mode 100644 webui/src/components/Tracks/RemoteTrackCall.vue
 create mode 100644 webui/src/components/Tracks/RemoteTrackSettings.vue
 create mode 100644 webui/src/components/Tracks/Tracks.vue
 create mode 100644 webui/src/ws/tracks.ts

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83de084..4b26750 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,6 +116,7 @@ set(SRCS_LIB
   src/social.c
   src/source.c
   src/stats.c
+  src/tracks.c
   src/users.c
   src/ws.c
   ${CMAKE_CURRENT_BINARY_DIR}/version.c
diff --git a/include/mix.h b/include/mix.h
index e15c972..6eb5fa5 100644
--- a/include/mix.h
+++ b/include/mix.h
@@ -134,6 +134,7 @@ int slmix_update_room(void);
  */
 int slmix_sip_init(struct mix *mix);
 int slmix_sip_close(void);
+struct ua *slmix_sip_ua(void);
 
 
 /******************************************************************************
@@ -199,14 +200,17 @@ int user_event_json(char **json, enum user_event event, struct session *sess);
 /******************************************************************************
  * ws.c
  */
+enum ws_type { WS_USERS, WS_TRACKS };
 int sl_ws_init(void);
 int sl_ws_close(void);
-int sl_ws_open(struct http_conn *httpc, const struct http_msg *msg,
-	       struct mix *mix, struct session *sess);
-void sl_ws_send_event(struct session *sess, char *json);
-void sl_ws_send_event_self(struct session *sess, char *json);
-void sl_ws_send_event_host(char *json);
-void sl_ws_send_event_all(char *json);
+int sl_ws_open(enum ws_type type, struct http_conn *httpc,
+	       const struct http_msg *msg, struct mix *mix,
+	       struct session *sess);
+void sl_ws_send_event(enum ws_type type, struct session *sess, char *json);
+void sl_ws_send_event_self(enum ws_type type, struct session *sess,
+			   char *json);
+void sl_ws_send_event_host(enum ws_type type, char *json);
+void sl_ws_send_event_all(enum ws_type type, char *json);
 void sl_ws_dummyh(const struct websock_hdr *hdr, struct mbuf *mb, void *arg);
 void sl_ws_users_auth(const struct websock_hdr *hdr, struct mbuf *mb,
 		      void *arg);
@@ -290,3 +294,57 @@ void slmix_stats_close(void);
  */
 int social_request(struct http_conn *conn, const struct http_msg *msg,
 		   struct session *sess);
+
+/******************************************************************************
+ * tracks.c
+ */
+/* Local audio device track */
+struct sl_local {
+	struct slaudio *slaudio;
+};
+
+/* Remote audio call track */
+struct sl_remote {
+	struct call *call;
+};
+enum sl_track_type { SL_TRACK_REMOTE, SL_TRACK_LOCAL };
+enum sl_track_status {
+	SL_TRACK_INVALID	     = -1,
+	SL_TRACK_IDLE		     = 0,
+	SL_TRACK_LOCAL_REGISTERING   = 1,
+	SL_TRACK_LOCAL_REGISTER_OK   = 2,
+	SL_TRACK_LOCAL_REGISTER_FAIL = 3,
+	SL_TRACK_LOCAL_AUDIO_READY   = 4,
+	SL_TRACK_REMOTE_CONNECTED    = 5,
+	SL_TRACK_REMOTE_CALLING	     = 6,
+	SL_TRACK_REMOTE_INCOMING     = 7,
+};
+struct sl_track {
+	struct le le;
+	uint16_t id;
+	enum sl_track_type type;
+	char name[64];
+	char error[128];
+	enum sl_track_status status;
+	bool muted;
+	union
+	{
+		struct sl_local local;
+		struct sl_remote remote;
+	} u;
+};
+int sl_tracks_init(void);
+int sl_tracks_close(void);
+const struct list *sl_tracks(void);
+int sl_track_next_id(void);
+int sl_track_add(struct sl_track **trackp, enum sl_track_type type);
+int sl_track_del(int id);
+enum sl_track_status sl_track_status(int id);
+int sl_tracks_json(struct re_printf *pf, void *arg);
+struct sl_track *sl_track_by_id(int id);
+struct slaudio *sl_track_audio(struct sl_track *track);
+int sl_track_dial(struct sl_track *track, struct pl *peer);
+void sl_track_accept(struct sl_track *track);
+void sl_track_hangup(struct sl_track *track);
+void sl_track_toggle_mute(struct sl_track *track);
+void sl_track_ws_send(void);
diff --git a/src/chat.c b/src/chat.c
index 21ba8e5..936e2e6 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -47,7 +47,7 @@ int chat_save(struct user *user, struct mix *mix, const struct http_msg *msg)
 	if (err)
 		return err;
 
-	sl_ws_send_event_all(json);
+	sl_ws_send_event_all(WS_USERS, json);
 
 	mem_deref(json);
 
diff --git a/src/http.c b/src/http.c
index 163c91b..80a9ca2 100644
--- a/src/http.c
+++ b/src/http.c
@@ -232,7 +232,99 @@ static void http_req_handler(struct http_conn *conn,
 	 * Websocket Request
 	 */
 	if (0 == pl_strcasecmp(&msg->path, "/ws/v1/users")) {
-		sl_ws_open(conn, msg, mix, sess);
+		sl_ws_open(WS_USERS, conn, msg, mix, sess);
+		return;
+	}
+
+	if (0 == pl_strcasecmp(&msg->path, "/ws/v1/tracks")) {
+		sl_ws_open(WS_TRACKS, conn, msg, mix, sess);
+		return;
+	}
+
+	ROUTE("/api/v1/tracks/remote", "POST")
+	{
+		struct sl_track *track;
+
+		err = sl_track_add(&track, SL_TRACK_REMOTE);
+		if (err)
+			goto err;
+
+		sl_track_ws_send();
+
+		http_sreply(conn, 204, "OK", "text/html", "", 0, sess);
+		return;
+	}
+
+	ROUTE("/api/v1/tracks", "DELETE")
+	{
+		struct pl pltrack = {"3", 2};
+		err = re_regex((char *)mbuf_buf(msg->mb),
+			       mbuf_get_left(msg->mb), "[0-9]+", &pltrack);
+		int32_t id = pl_i32(&pltrack);
+
+		err = sl_track_del(id);
+		if (err)
+			goto notfound;
+
+		sl_track_ws_send();
+
+		http_sreply(conn, 204, "OK", "text/html", "", 0, sess);
+		return;
+	}
+
+	ROUTE("/api/v1/tracks/accept", "POST")
+	{
+		struct pl pltrack = PL_INIT;
+
+		err = re_regex(msg->prm.p, msg->prm.l, "track=[0-9]+",
+			       &pltrack);
+		if (err)
+			goto err;
+
+		sl_track_accept(sl_track_by_id(pl_i32(&pltrack)));
+
+		sl_track_ws_send();
+
+		http_sreply(conn, 204, "OK", "text/html", "", 0, sess);
+		return;
+	}
+
+	ROUTE("/api/v1/tracks/hangup", "POST")
+	{
+		struct pl pltrack = PL_INIT;
+
+		err = re_regex(msg->prm.p, msg->prm.l, "track=[0-9]+",
+			       &pltrack);
+		if (err)
+			goto err;
+
+		sl_track_hangup(sl_track_by_id(pl_i32(&pltrack)));
+
+		sl_track_ws_send();
+
+		http_sreply(conn, 204, "OK", "text/html", "", 0, sess);
+		return;
+	}
+
+	ROUTE("/api/v1/tracks/dial", "POST")
+	{
+		struct pl pltrack = PL_INIT;
+		struct pl peer;
+
+		pl_set_mbuf(&peer, msg->mb);
+
+		err = re_regex(msg->prm.p, msg->prm.l, "track=[0-9]+",
+			       &pltrack);
+		if (err)
+			goto err;
+
+		err = sl_track_dial(sl_track_by_id(pl_i32(&pltrack)), &peer);
+		if (err)
+			goto err;
+
+		sl_track_ws_send();
+
+		http_sreply(conn, 204, "OK", "text/html", "", 0, sess);
 		return;
 	}
 
@@ -710,9 +802,9 @@ static void http_req_handler(struct http_conn *conn,
 
 	ROUTE("/api/v1/webrtc/stats", "POST")
 	{
+#if 0
 		struct sl_httpconn *http_conn;
 		char metric_url[URL_SZ] = {0};
-
 		err = sl_httpc_alloc(&http_conn, NULL, NULL, NULL);
 		if (err)
 			goto err;
@@ -721,6 +813,7 @@ static void http_req_handler(struct http_conn *conn,
 			    METRICS_URL "/instance/%s/user/%s", mix->room,
 			    sess->user->id);
 
+#endif
 		err = sl_mix_stats_append(msg->mb);
 		if (err)
 			goto err;
@@ -820,7 +913,7 @@ static void http_req_handler(struct http_conn *conn,
 		re_snprintf(json, sizeof(json),
 			    "{\"type\": \"emoji\", \"id\": %r }", &id);
 
-		sl_ws_send_event_all(json);
+		sl_ws_send_event_all(WS_USERS, json);
 		http_sreply(conn, 204, "OK", "text/html", "", 0, NULL);
 		return;
 	}
diff --git a/src/main.c b/src/main.c
index ae2deb3..af838d0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -226,8 +226,12 @@ int main(int argc, char *const argv[])
 	if (err)
 		return err;
 
+	sl_tracks_init();
+
 	re_main(signal_handler);
 
+	sl_tracks_close();
+
 	sl_ws_close();
 	slmix_close();
 
diff --git a/src/mix.c b/src/mix.c
index 2c84718..e017c24 100644
--- a/src/mix.c
+++ b/src/mix.c
@@ -89,7 +89,7 @@ void slmix_refresh_rooms(void *arg)
 
 	re_sdprintf(&json, "{\"type\": \"rooms\", \"rooms\": {%b}}", mjson.buf,
 		    mjson.end - 1);
-	sl_ws_send_event_all(json);
+	sl_ws_send_event_all(WS_USERS, json);
 	mem_deref(json);
 
 	slmix_db_cur_close(cur);
diff --git a/src/sess.c b/src/sess.c
index 0be72c1..9fa5fc5 100644
--- a/src/sess.c
+++ b/src/sess.c
@@ -446,7 +446,7 @@ int slmix_session_user_updated(struct session *sess)
 	if (err)
 		return err;
 
-	sl_ws_send_event_all(json);
+	sl_ws_send_event_all(WS_USERS, json);
 	json = mem_deref(json);
 
 	return 0;
diff --git a/src/sip.c b/src/sip.c
index f48e057..2a126c3 100644
--- a/src/sip.c
+++ b/src/sip.c
@@ -16,7 +16,7 @@ static void destruct_sess_e(void *arg)
 
 	char *json = NULL;
 	user_event_json(&json, USER_DELETED, e->sess);
-	sl_ws_send_event(e->sess, json);
+	sl_ws_send_event(WS_USERS, e->sess, json);
 	mem_deref(json);
 
 	list_unlink(&e->le);
@@ -116,6 +116,12 @@ static void ua_event_handler(enum bevent_ev ev, struct bevent *event,
 }
 
 
+struct ua *slmix_sip_ua(void)
+{
+	return sip_ua;
+}
+
+
 int slmix_sip_init(struct mix *mix)
 {
 	int err;
diff --git a/src/source.c b/src/source.c
index c27fa63..3db58bf 100644
--- a/src/source.c
+++ b/src/source.c
@@ -12,7 +12,7 @@ static int ws_json(struct session *sess, const struct odict *od)
 	if (err)
 		goto out;
 
-	sl_ws_send_event_self(sess, buf);
+	sl_ws_send_event_self(WS_USERS, sess, buf);
 
 out:
 	mem_deref(buf);
diff --git a/src/tracks.c b/src/tracks.c
new file mode 100644
index 0000000..a2da837
--- /dev/null
+++ b/src/tracks.c
@@ -0,0 +1,429 @@
+#include <re.h>
+#include <baresip.h>
+#include <mix.h>
+
+#define SL_MAX_TRACKS 16
+
+static struct list tracks = LIST_INIT;
+
+/* TODO: refactor allow multiple local tracks */
+static struct sl_track *local_track = NULL;
+
+
+const struct list *sl_tracks(void)
+{
+	return &tracks;
+}
+
+
+int sl_tracks_json(struct re_printf *pf, void *arg)
+{
+	struct le *le;
+	struct odict *o_tracks;
+	struct odict *o_track;
+	char id[ITOA_BUFSZ];
+	int err;
+	(void)arg;
+
+	if (!pf)
+		return EINVAL;
+
+	err = odict_alloc(&o_tracks, 32);
+	if (err)
+		return ENOMEM;
+
+	LIST_FOREACH(&tracks, le)
+	{
+		struct sl_track *track = le->data;
+		if (!track)
+			continue;
+
+		err = odict_alloc(&o_track, 32);
+		if (err)
+			return ENOMEM;
+
+		if (track->type == SL_TRACK_REMOTE) {
+			odict_entry_add(o_track, "type", ODICT_STRING,
+					"remote");
+		}
+
+		odict_entry_add(o_track, "name", ODICT_STRING, track->name);
+		odict_entry_add(o_track, "status", ODICT_INT, track->status);
+		odict_entry_add(o_track, "error", ODICT_STRING, track->error);
+		odict_entry_add(o_track, "muted", ODICT_BOOL, track->muted);
+		odict_entry_add(o_tracks, str_itoa(track->id, id, 10),
+				ODICT_OBJECT, o_track);
+		o_track = mem_deref(o_track);
+	}
+
+	err = json_encode_odict(pf, o_tracks);
+	mem_deref(o_tracks);
+
+	return err;
+}
+
+
+static bool sort_handler(struct le *le1, struct le *le2, void *arg)
+{
+	struct sl_track *track1 = le1->data;
+	struct sl_track *track2 = le2->data;
+	(void)arg;
+
+	/* NOTE: important to use less than OR equal to, otherwise
+	   the list_sort function may be stuck in a loop */
+	return track1->id <= track2->id;
+}
+
+
+int sl_track_next_id(void)
+{
+	int id = 1;
+	struct le *le;
+
+	LIST_FOREACH(&tracks, le)
+	{
+		struct sl_track *track = le->data;
+		if (track->id == id) {
+			++id;
+			continue;
+		}
+		break;
+	}
+
+	return id;
+}
+
+
+static void track_destructor(void *data)
+{
+	struct sl_track *track = data;
+
+	list_unlink(&track->le);
+
+	if (track->type == SL_TRACK_LOCAL)
+		mem_deref(track->u.local.slaudio);
+
+	if (track->type == SL_TRACK_REMOTE) {
+		if (track->u.remote.call)
+			ua_hangup(slmix_sip_ua(), track->u.remote.call, 0,
+				  NULL);
+	}
+}
+
+
+int sl_track_add(struct sl_track **trackp, enum sl_track_type type)
+{
+	struct sl_track *track;
+
+	if (!trackp)
+		return EINVAL;
+
+	if (list_count(&tracks) >= SL_MAX_TRACKS) {
+		warning("sl_track_add: max. %d tracks reached\n",
+			SL_MAX_TRACKS);
+		return E2BIG;
+	}
+
+	track = mem_zalloc(sizeof(struct sl_track), track_destructor);
+	if (!track)
+		return ENOMEM;
+
+	track->id     = sl_track_next_id();
+	track->type   = type;
+	track->status = SL_TRACK_IDLE;
+	track->muted  = false;
+
+	list_append(&tracks, &track->le, track);
+	list_sort(&tracks, sort_handler, NULL);
+
+	*trackp = track;
+
+	return 0;
+}
+
+
+int sl_track_del(int id)
+{
+	struct le *le;
+
+	LIST_FOREACH(&tracks, le)
+	{
+		struct sl_track *track = le->data;
+		if (track->id == id) {
+			mem_deref(track);
+			return 0;
+		}
+	}
+	return ENOENT;
+}
+
+
+struct sl_track *sl_track_by_id(int id)
+{
+	struct le *le;
+
+	LIST_FOREACH(&tracks, le)
+	{
+		struct sl_track *track = le->data;
+		if (track->id == id) {
+			return track;
+		}
+	}
+	return NULL;
+}
+
+
+enum sl_track_status sl_track_status(int id)
+{
+	struct le *le;
+
+	LIST_FOREACH(&tracks, le)
+	{
+		struct sl_track *track = le->data;
+		if (track->id == id)
+			return track->status;
+	}
+
+	return SL_TRACK_INVALID;
+}
+
+
+struct slaudio *sl_track_audio(struct sl_track *track)
+{
+	if (!track || track->type != SL_TRACK_LOCAL)
+		return NULL;
+
+	return track->u.local.slaudio;
+}
+
+
+int sl_track_dial(struct sl_track *track, struct pl *peer)
+{
+	int err;
+	char *peerc = NULL;
+
+	if (!track || track->type != SL_TRACK_REMOTE)
+		return EINVAL;
+
+	track->error[0] = '\0';
+
+	err = account_uri_complete_strdup(ua_account(slmix_sip_ua()), &peerc,
+					  peer);
+	if (err)
+		goto out;
+
+	err = ua_connect(slmix_sip_ua(), &track->u.remote.call, NULL, peerc,
+			 VIDMODE_OFF);
+	if (err)
+		goto out;
+
+	track->status = SL_TRACK_REMOTE_CALLING;
+	pl_strcpy(peer, track->name, sizeof(track->name));
+	char buf[ITOA_BUFSZ];
+	char *id = str_itoa(track->id, buf, 10);
+	audio_set_devicename(call_audio(track->u.remote.call), id, id);
+
+out:
+	if (err)
+		re_snprintf(track->error, sizeof(track->error), "%m", err);
+
+	if (err == EINVAL)
+		str_ncpy(track->error, "Invalid ID", sizeof(track->error));
+
+
+	sl_track_ws_send();
+
+	mem_deref(peerc);
+
+	return err;
+}
+
+
+void sl_track_accept(struct sl_track *track)
+{
+	if (!track || track->type != SL_TRACK_REMOTE)
+		return;
+
+	ua_answer(call_get_ua(track->u.remote.call), track->u.remote.call,
+		  VIDMODE_OFF);
+}
+
+
+void sl_track_hangup(struct sl_track *track)
+{
+	if (!track || track->type != SL_TRACK_REMOTE)
+		return;
+
+	ua_hangup(call_get_ua(track->u.remote.call), track->u.remote.call, 0,
+		  "");
+
+	track->name[0]	     = '\0';
+	track->u.remote.call = NULL;
+}
+
+
+void sl_track_toggle_mute(struct sl_track *track)
+{
+	/* only allowed for local track currently */
+	if (!track || track->id != 1)
+		return;
+
+	local_track->muted = !local_track->muted;
+	//sl_audio_mute(local_track->u.local.slaudio, local_track->muted);
+	sl_track_ws_send();
+}
+
+
+void sl_track_ws_send(void)
+{
+	char *json_str;
+	re_sdprintf(&json_str, "%H", sl_tracks_json, NULL);
+	sl_ws_send_event_host(WS_TRACKS, json_str);
+	mem_deref(json_str);
+}
+
+
+static void call_incoming(struct call *call)
+{
+	struct le *le;
+	struct sl_track *track;
+
+	if (!call)
+		return;
+
+	LIST_FOREACH(&tracks, le)
+	{
+		track = le->data;
+
+		if (track->type != SL_TRACK_REMOTE)
+			continue;
+
+		if (track->u.remote.call)
+			continue;
+
+		goto out;
+	}
+
+	/* Add new track if no empty remote track is found */
+	sl_track_add(&track, SL_TRACK_REMOTE);
+
+out:
+	track->u.remote.call = call;
+	track->status	     = SL_TRACK_REMOTE_INCOMING;
+	str_ncpy(track->name, call_peeruri(call), sizeof(track->name));
+	char buf[ITOA_BUFSZ];
+	char *id = str_itoa(track->id, buf, 10);
+	audio_set_devicename(call_audio(call), id, id);
+}
+
+
+static void eventh(enum bevent_ev ev, struct bevent *event, void *arg)
+{
+	struct le *le;
+	bool changed		  = false;
+	struct call *call	  = bevent_get_call(event);
+	const char *prm		  = bevent_get_text(event);
+	const struct sip_msg *msg = bevent_get_msg(event);
+	(void)arg;
+
+	if (ev == BEVENT_SIPSESS_CONN) {
+		struct ua *ua = uag_find_msg(msg);
+		ua_accept(ua, msg);
+		bevent_stop(event);
+		return;
+	}
+
+	if (ev == BEVENT_CALL_INCOMING) {
+		call_incoming(call);
+		sl_track_ws_send();
+		return;
+	}
+
+	if (ev == BEVENT_REGISTERING) {
+		if (local_track) {
+			str_ncpy(local_track->name,
+				 account_aor(ua_account(slmix_sip_ua())),
+				 sizeof(local_track->name));
+			local_track->status = SL_TRACK_LOCAL_REGISTERING;
+			sl_track_ws_send();
+		}
+		return;
+	}
+
+	if (ev == BEVENT_REGISTER_OK) {
+		if (local_track) {
+			local_track->status = SL_TRACK_LOCAL_REGISTER_OK;
+			sl_track_ws_send();
+		}
+		return;
+	}
+
+	if (ev == BEVENT_REGISTER_FAIL) {
+		if (local_track) {
+			local_track->status = SL_TRACK_LOCAL_REGISTER_FAIL;
+			sl_track_ws_send();
+		}
+		return;
+	}
+
+	if (ev == BEVENT_SHUTDOWN) {
+		list_flush(&tracks);
+		return;
+	}
+
+	LIST_FOREACH(&tracks, le)
+	{
+		struct sl_track *track = le->data;
+
+		if (track->type != SL_TRACK_REMOTE)
+			continue;
+
+		if (track->u.remote.call != call)
+			continue;
+
+
+		if (ev == BEVENT_CALL_RINGING) {
+			track->status = SL_TRACK_REMOTE_CALLING;
+			changed	      = true;
+		}
+
+		if (ev == BEVENT_CALL_ESTABLISHED) {
+			track->status = SL_TRACK_REMOTE_CONNECTED;
+			changed	      = true;
+		}
+
+		if (ev == BEVENT_CALL_CLOSED) {
+			track->status	     = SL_TRACK_IDLE;
+			track->u.remote.call = NULL;
+			track->name[0]	     = '\0';
+			if (call_scode(call) != 200)
+				str_ncpy(track->error, prm,
+					 sizeof(track->error));
+			changed = true;
+		}
+	}
+
+	if (!changed)
+		return;
+
+	sl_track_ws_send();
+}
+
+
+int sl_tracks_init(void)
+{
+	bevent_register(eventh, NULL);
+
+	return 0;
+}
+
+
+int sl_tracks_close(void)
+{
+	bevent_unregister(eventh);
+	list_flush(&tracks);
+
+	local_track = NULL;
+
+	return 0;
+}
diff --git a/src/ws.c b/src/ws.c
index 687f036..bba9559 100644
--- a/src/ws.c
+++ b/src/ws.c
@@ -9,6 +9,7 @@ struct ws_conn {
 	struct websock_conn *c;
 	struct mix *mix;
 	struct session *sess;
+	enum ws_type type;
 };
 
 enum { KEEPALIVE = 30 * 1000 };
@@ -57,7 +58,7 @@ static void conn_destroy(void *arg)
 		wsc->sess->user->video = false;
 
 		if (0 == user_event_json(&json, USER_DELETED, wsc->sess)) {
-			sl_ws_send_event(wsc->sess, json);
+			sl_ws_send_event(WS_USERS, wsc->sess, json);
 			json = mem_deref(json);
 		}
 
@@ -99,8 +100,9 @@ static void ws_recv_h(const struct websock_hdr *hdr, struct mbuf *mb,
 }
 
 
-int sl_ws_open(struct http_conn *httpc, const struct http_msg *msg,
-	       struct mix *mix, struct session *sess)
+int sl_ws_open(enum ws_type type, struct http_conn *httpc,
+	       const struct http_msg *msg, struct mix *mix,
+	       struct session *sess)
 {
 	struct ws_conn *ws_conn;
 	int err;
@@ -119,9 +121,13 @@ int sl_ws_open(struct http_conn *httpc, const struct http_msg *msg,
 	ws_conn->sess = mem_ref(sess);
 	mem_ref(ws_conn->sess->user);
 	ws_conn->sess->connected = true;
+	ws_conn->type		 = type;
 
 	list_append(&wsl, &ws_conn->le, ws_conn);
 
+	if (type != WS_USERS)
+		goto out;
+
 	char *json = NULL;
 	if (0 == users_json(&json, ws_conn->mix)) {
 		websock_send(ws_conn->c, WEBSOCK_TEXT, "%s", json);
@@ -133,7 +139,7 @@ int sl_ws_open(struct http_conn *httpc, const struct http_msg *msg,
 	slmix_refresh_rooms(&force);
 
 	if (0 == user_event_json(&json, USER_ADDED, ws_conn->sess)) {
-		sl_ws_send_event(ws_conn->sess, json);
+		sl_ws_send_event(WS_USERS, ws_conn->sess, json);
 		json = mem_deref(json);
 	}
 
@@ -145,7 +151,7 @@ int sl_ws_open(struct http_conn *httpc, const struct http_msg *msg,
 }
 
 
-void sl_ws_send_event(struct session *sess, char *json)
+void sl_ws_send_event(enum ws_type type, struct session *sess, char *json)
 {
 	struct le *le;
 
@@ -157,12 +163,14 @@ void sl_ws_send_event(struct session *sess, char *json)
 		struct ws_conn *ws_conn = le->data;
 		if (ws_conn->sess == sess)
 			continue;
+		if (ws_conn->type != type)
+			continue;
 		websock_send(ws_conn->c, WEBSOCK_TEXT, "%s", json);
 	}
 }
 
 
-void sl_ws_send_event_self(struct session *sess, char *json)
+void sl_ws_send_event_self(enum ws_type type, struct session *sess, char *json)
 {
 	struct le *le;
 
@@ -174,12 +182,14 @@ void sl_ws_send_event_self(struct session *sess, char *json)
 		struct ws_conn *ws_conn = le->data;
 		if (ws_conn->sess != sess)
 			continue;
+		if (ws_conn->type != type)
+			continue;
 		websock_send(ws_conn->c, WEBSOCK_TEXT, "%s", json);
 	}
 }
 
 
-void sl_ws_send_event_host(char *json)
+void sl_ws_send_event_host(enum ws_type type, char *json)
 {
 	struct le *le;
 
@@ -191,12 +201,14 @@ void sl_ws_send_event_host(char *json)
 		struct ws_conn *ws_conn = le->data;
 		if (!ws_conn->sess->user->host)
 			continue;
+		if (ws_conn->type != type)
+			continue;
 		websock_send(ws_conn->c, WEBSOCK_TEXT, "%s", json);
 	}
 }
 
 
-void sl_ws_send_event_all(char *json)
+void sl_ws_send_event_all(enum ws_type type, char *json)
 {
 	struct le *le;
 
@@ -206,6 +218,8 @@ void sl_ws_send_event_all(char *json)
 	LIST_FOREACH(&wsl, le)
 	{
 		struct ws_conn *ws_conn = le->data;
+		if (ws_conn->type != type)
+			continue;
 		websock_send(ws_conn->c, WEBSOCK_TEXT, "%s", json);
 	}
 }
@@ -240,7 +254,7 @@ static void ws_send_rtcp_stats(struct mix *mix)
 			    "}}",
 			    sess->user->speaker_id, audio_stat->rtt / 1000,
 			    video_stat->rtt / 1000);
-		sl_ws_send_event_all(json);
+		sl_ws_send_event_all(WS_USERS, json);
 	}
 }
 
@@ -262,7 +276,7 @@ static void update_handler(void *arg)
 	re_snprintf(json, sizeof(json),
 		    "{\"type\": \"rec\", \"t\": %lu, \"s\": %u}", secs,
 		    mix->talk_detect_h());
-	sl_ws_send_event_all(json);
+	sl_ws_send_event_all(WS_USERS, json);
 
 	ws_send_rtcp_stats(mix);
 
diff --git a/webui/index.html b/webui/index.html
index 0188ddc..66cb364 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -10,7 +10,7 @@
     <base target="_blank">
 </head>
 
-<body class="h-full">
+<body class="h-full" style="background-color: #0f0f0f">
     <div id="app"></div>
     <script type="module" src="/src/main.ts"></script>
 </body>
diff --git a/webui/src/api.ts b/webui/src/api.ts
index 0511bcc..a7460f7 100644
--- a/webui/src/api.ts
+++ b/webui/src/api.ts
@@ -2,6 +2,7 @@ import config from './config'
 import { Webrtc } from './webrtc'
 import router from './router'
 import { State, RecordType } from './ws/state'
+import { Tracks } from './ws/tracks'
 import { Error } from './error'
 
 
@@ -96,6 +97,7 @@ export default {
 
     async websocket() {
         State.websocket()
+        Tracks.websocket()
     },
 
     async call() {
@@ -204,5 +206,25 @@ export default {
         if (!resp?.ok)
             return
         return JSON.parse(await resp?.text()!)
+    },
+
+    async track_add(type: string) {
+        api_fetch('POST', '/tracks/' + type, null);
+    },
+
+    async track_del(track: number) {
+        api_fetch('DELETE', '/tracks', String(track))
+    },
+
+    async track_accept(track: number) {
+        api_fetch('POST', '/tracks/accept?track=' + String(track), null)
+    },
+
+    async track_hangup(track: number) {
+        api_fetch('POST', '/tracks/hangup?track=' + String(track), null);
+    },
+
+    async track_dial(track: number, peer: string) {
+        api_fetch('POST', '/tracks/dial?track=' + String(track), peer);
     }
 }
diff --git a/webui/src/components/Tracks/RemoteTrack.vue b/webui/src/components/Tracks/RemoteTrack.vue
new file mode 100644
index 0000000..4d1503b
--- /dev/null
+++ b/webui/src/components/Tracks/RemoteTrack.vue
@@ -0,0 +1,86 @@
+<template>
+    <li aria-label="Remote track" class="aspect-video col-span-1" @mouseenter="setActive()" @touchstart.passive="setActive()">
+        <div class="flex justify-between h-5">
+            <h2 class="ml-1 font-semibold text-sl-disabled text-sm truncate pr-2">{{ getTrackName() }}</h2>
+            <div class="flex">
+                <div class="font-semibold text-sm text-sl-disabled uppercase text-right"></div>
+            </div>
+            <!-- <div class="font-semibold text-sm text-yellow-500 uppercase">Calling</div> -->
+            <!-- <div class="font-semibold text-sm text-red-500 uppercase">Error</div> -->
+            <!-- <div class="font-semibold text-sm text-sl-green uppercase">Connected</div> -->
+            <!-- <div class="font-semibold text-sm text-sl-yellow uppercase">Calling</div> -->
+            <!-- <div class="font-semibold text-sm text-sl-red uppercase">Error</div> -->
+        </div>
+
+        <div class="flex mt-1">
+            <div class="relative bg-sl-02dpa rounded-lg min-h-[10em] w-full shadow-sm pb-2">
+                <div class="flex justify-between items-center">
+                    <div :id="`track${pkey}`" ref="tid" tabindex="0" @focus="setActive()"
+                        :class="[isActive() ? 'bg-sl-disabled' : 'bg-sl-24dpa']"
+                        class="inline-flex items-center justify-center ml-2 text-sm leading-none text-black font-bold rounded-full px-2 py-1 focus:outline-hidden">
+                        <span class="sr-only">Remote Track</span>
+                        {{ pkey }}
+                        <span class="sr-only">selected</span>
+                    </div>
+                    <div class="shrink-0 pr-2 text-right mt-2 w-8 h-8">
+                        <RemoteTrackSettings v-if="isActive()" :pkey="props.pkey" />
+                    </div>
+                </div>
+                <RemoteTrackCall :pkey="props.pkey" :idx="props.idx" :error="props.error" />
+                <div class="absolute bottom-0 right-0 mr-0.5 text-xs">
+                    <button class="opacity-30 hover:opacity-60 focus:opacity-60" title="Remove track"
+                        @click="deleteRemoteTrack()" @focus="setActive()">
+                        <svg v-if="isActive()" class="w-5 h-5" viewBox="0 0 20 20" fill="currentColor">
+                            <path fill-rule="evenodd"
+                                d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
+                                clip-rule="evenodd" />
+                        </svg>
+                    </button>
+                </div>
+            </div>
+
+            <div class="flex w-5 items-end ml-0.5 opacity-60" aria-hidden="true">
+                <div id="levels" class="levels">
+                    <div :id="'level'+(pkey+pkey-1)" class="level"></div>
+                    <div :id="'level'+(pkey+pkey)" class="level"></div>
+                </div>
+            </div>
+        </div>
+    </li>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import RemoteTrackSettings from './RemoteTrackSettings.vue'
+import RemoteTrackCall from './RemoteTrackCall.vue'
+import { Tracks } from '../../ws/tracks'
+import api from '../../api'
+
+const props = defineProps({ 
+    'pkey': { type: Number, required: true },
+    'idx': { type: Number, required: true },
+    'error': { type: String, required: true },
+})
+
+const tid = ref<HTMLDivElement>()
+
+onMounted(() => {
+    tid.value?.focus()
+})
+
+function isActive() {
+    return Tracks.isSelected(props.pkey)
+}
+
+function setActive() {
+    Tracks.select(props.pkey)
+}
+
+function getTrackName() {
+    return Tracks.getTrackName(props.pkey)
+}
+
+function deleteRemoteTrack() {
+    api.track_del(props.pkey)
+}
+</script>
diff --git a/webui/src/components/Tracks/RemoteTrackCall.vue b/webui/src/components/Tracks/RemoteTrackCall.vue
new file mode 100644
index 0000000..6b5f522
--- /dev/null
+++ b/webui/src/components/Tracks/RemoteTrackCall.vue
@@ -0,0 +1,100 @@
+<template>
+    <div v-if="isActive() && isNoCall()" class="flex-1 px-4 grid grid-cols-1">
+        <label :for="pkey.toString()" class="block text-sm font-medium leading-5 text-sl-on_surface_2">Enter
+            Partner ID</label>
+        <div class="mt-1 relative rounded-md shadow-xs">
+            <input @keyup.enter="api.track_dial(pkey, peer)" :id="pkey.toString()" v-model="peer" ref="slid" type="text"
+                class="form-input block w-full sm:text-sm sm:leading-5 text-sl-on_surface_1 bg-sl-surface mb-2 border-none focus:ring-sl-primary rounded-lg"
+                placeholder="xyz@studio.link" />
+                <p class="text-sm text-red-500">{{ error }}</p>
+        </div>
+        <div class="mt-2 flex justify-between items-center">
+            <ButtonPrimary @click="api.track_dial(pkey, peer)">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor"
+                    class="h-4 mr-1">
+                    <path
+                        d="M17.924 2.617a.997.997 0 00-.215-.322l-.004-.004A.997.997 0 0017 2h-4a1 1 0 100 2h1.586l-3.293 3.293a1 1 0 001.414 1.414L16 5.414V7a1 1 0 102 0V3a.997.997 0 00-.076-.383z" />
+                    <path
+                        d="M2 3a1 1 0 011-1h2.153a1 1 0 01.986.836l.74 4.435a1 1 0 01-.54 1.06l-1.548.773a11.037 11.037 0 006.105 6.105l.774-1.548a1 1 0 011.059-.54l4.435.74a1 1 0 01.836.986V17a1 1 0 01-1 1h-2C7.82 18 2 12.18 2 5V3z" />
+                </svg>
+                Call
+            </ButtonPrimary>
+            <!--
+            <span class="text-sl-on_surface_2">OR</span>
+            <ButtonSecondary>
+                <svg xmlns="http://www.w3.org/2000/svg" class="h-4 mr-1" viewBox="0 0 20 20"
+                    fill="currentColor">
+                    <path fill-rule="evenodd"
+                        d="M12.586 4.586a2 2 0 112.828 2.828l-3 3a2 2 0 01-2.828 0 1 1 0 00-1.414 1.414 4 4 0 005.656 0l3-3a4 4 0 00-5.656-5.656l-1.5 1.5a1 1 0 101.414 1.414l1.5-1.5zm-5 5a2 2 0 012.828 0 1 1 0 101.414-1.414 4 4 0 00-5.656 0l-3 3a4 4 0 105.656 5.656l1.5-1.5a1 1 0 10-1.414-1.414l-1.5 1.5a2 2 0 11-2.828-2.828l3-3z"
+                        clip-rule="evenodd" />
+                </svg>Invite
+            </ButtonSecondary>
+            -->
+        </div>
+    </div>
+    <div v-if="!isActive() && isNoCall()" class="text-center mt-10 text-sl-disabled">No call</div>
+    <div v-if="isIncoming()" class="text-center mt-2 text-sl-disabled">
+        <div class="mb-4 truncate animate-pulse">Incoming call from <br />{{ peerName() }}</div>
+        <ButtonPrimary @click="api.track_accept(pkey)" class="mr-2">
+            Accept
+        </ButtonPrimary>
+        <ButtonSecondary @click="api.track_hangup(pkey)">
+            Cancel 
+        </ButtonSecondary>
+    </div>
+    <div v-if="isCalling()" class="text-center mt-2 text-sl-disabled">
+        <div class="mb-4 truncate animate-pulse">Calling <br />{{ peerName() }}</div>
+        <ButtonSecondary @click="api.track_hangup(pkey)">
+            Hangup
+        </ButtonSecondary>
+    </div>
+    <div v-if="isOnCall()" class="text-center">
+        <svg class="w-24 h-24 fill-yellow-800 mx-auto"
+        xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
+        <path
+        d="M224 32C135.6 32 64 103.6 64 192v16c0 8.8-7.2 16-16 16s-16-7.2-16-16V192C32 86 118 0 224 0S416 86 416 192v16c0 61.9-50.1 112-112 112H240 224 208c-17.7 0-32-14.3-32-32s14.3-32 32-32h32c17.7 0 32 14.3 32 32h32c44.2 0 80-35.8 80-80V192c0-88.4-71.6-160-160-160zM96 192c0-70.7 57.3-128 128-128s128 57.3 128 128c0 13.9-2.2 27.3-6.3 39.8C337.4 246.3 321.8 256 304 256h-8.6c-11.1-19.1-31.7-32-55.4-32H208c-35.3 0-64 28.7-64 64c0 1.4 0 2.7 .1 4C114.8 268.6 96 232.5 96 192zM224 352h16 64 9.6C387.8 352 448 412.2 448 486.4c0 14.1-11.5 25.6-25.6 25.6H25.6C11.5 512 0 500.5 0 486.4C0 412.2 60.2 352 134.4 352H208h16z" />
+        </svg>
+        <ButtonSecondary v-if="isActive()" class="mt-2" @click="api.track_hangup(pkey)">
+        Hangup
+        </ButtonSecondary>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { Tracks, TrackStatus } from '../../ws/tracks'
+import api from '../../api'
+
+const props = defineProps({
+'pkey': { type: Number, required: true },
+'idx': { type: Number, required: true },
+'error': { type: String, required: true }
+})
+
+const peer = ref("");
+
+function isActive() {
+    return Tracks.isSelected(props.pkey)
+}
+
+function isOnCall() {
+    return Tracks.remote_tracks[props.idx].status === TrackStatus.REMOTE_CONNECTED
+}
+
+function isNoCall() {
+    return Tracks.remote_tracks[props.idx].status === TrackStatus.IDLE
+}
+
+function isCalling() {
+    return Tracks.remote_tracks[props.idx].status === TrackStatus.REMOTE_CALLING
+}
+
+function isIncoming() {
+    return Tracks.remote_tracks[props.idx].status === TrackStatus.REMOTE_INCOMING
+}
+
+function peerName() {
+    return Tracks.getTrackName(props.pkey);
+}
+
+</script>
diff --git a/webui/src/components/Tracks/RemoteTrackSettings.vue b/webui/src/components/Tracks/RemoteTrackSettings.vue
new file mode 100644
index 0000000..e9faa8c
--- /dev/null
+++ b/webui/src/components/Tracks/RemoteTrackSettings.vue
@@ -0,0 +1,43 @@
+<template>
+    <Menu as="div" class="relative inline-block text-left">
+        <div>
+            <MenuButton
+                class="flex items-center rounded-full text-neutral-500 hover:text-neutral-400 focus:outline-hidden focus:ring-2 focus:ring-sl-primary">
+                <span class="sr-only">Open options</span>
+                <EllipsisVerticalIcon class="h-6 w-6" aria-hidden="true" />
+            </MenuButton>
+        </div>
+
+        <transition enter-active-class="transition ease-out duration-100"
+            enter-from-class="transform opacity-0 scale-95" enter-to-class="transform opacity-100 scale-100"
+            leave-active-class="transition ease-in duration-75" leave-from-class="transform opacity-100 scale-100"
+            leave-to-class="transform opacity-0 scale-95">
+            <MenuItems
+                class="absolute right-0 z-10 mt-2 w-56 origin-top-right divide-y divide-neutral-800 rounded-md shadow-lg ring-1 ring-black ring-opacity-5 bg-sl-06dp text-sl-on_surface_2">
+                <div class="py-1">
+                    <MenuItem v-slot="{ active }">
+                    <a href="#" @click="deleteTrack()" :class="[active ? 'bg-sl-01dp' : '', 'group flex items-center px-4 py-2 text-sm']">
+
+                        <TrashIcon class="mr-3 h-5 w-5 text-neutral-400 group-hover:text-neutral-500"
+                            aria-hidden="true" />
+                        Delete Track
+                    </a>
+                    </MenuItem>
+                </div>
+            </MenuItems>
+        </transition>
+    </Menu>
+</template>
+
+<script setup lang="ts">
+import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/vue'
+import { EllipsisVerticalIcon, TrashIcon } from '@heroicons/vue/20/solid'
+import api from '../../api'
+
+const props = defineProps({ 'pkey': { type: Number, required: true } })
+
+function deleteTrack() {
+    api.track_del(props.pkey)
+}
+
+</script>
diff --git a/webui/src/components/Tracks/Tracks.vue b/webui/src/components/Tracks/Tracks.vue
new file mode 100644
index 0000000..241acfa
--- /dev/null
+++ b/webui/src/components/Tracks/Tracks.vue
@@ -0,0 +1,31 @@
+<template>
+    <ul class="grid grid-cols-1 gap-x-5 gap-y-2 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
+        <RemoteTrack v-for="(track, index) in remoteTracks" :key="track.id" :pkey="track.id" :idx="index" :error="track.error" />
+        <li class="col-span-1" @mouseenter="newTrackVisible = true" @mouseleave="newTrackVisible = false">
+            <div class="flex items-center justify-center h-24 md:h-44 mt-4">
+                <button accesskey="t" aria-label="Add Remote Track" :class="{
+                    'text-sl-disabled': newTrackVisible,
+                    'text-sl-01dp': !newTrackVisible,
+                }" class="inline-flex items-center rounded-lg px-20 py-12 font-bold text-2xl leading-none uppercase tracking-wide focus:outline-hidden focus:text-sl-disabled"
+                    @focus="newTrackVisible = true" @focusout="newTrackVisible = false"
+                    @click="api.track_add('remote')">
+                    <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                        stroke="currentColor" class="h-20 w-20">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                            d="M12 6v6m0 0v6m0-6h6m-6 0H6" />
+                    </svg>
+                </button>
+            </div>
+        </li>
+    </ul>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import RemoteTrack from './RemoteTrack.vue'
+import { Tracks } from '../../ws/tracks'
+import api from '../../api'
+
+const newTrackVisible = ref(false)
+const remoteTracks = Tracks.remote_tracks
+</script>
diff --git a/webui/src/index.css b/webui/src/index.css
index 227fab7..f39d414 100644
--- a/webui/src/index.css
+++ b/webui/src/index.css
@@ -29,3 +29,103 @@
     height: 325px;
   }
 }
+
+@plugin '@tailwindcss/forms';
+@plugin '@tailwindcss/typography';
+/*@plugin '@tailwindcss/aspect-ratio'; */
+
+@theme {
+  --font-*: initial;
+  --font-sans: 'Roboto Mono';
+
+  --color-sl-primary: #df7c00;
+  --color-sl-primary_h: #ff8d00;
+  --color-sl-surface: #121212;
+  --color-sl-disabled: #7b7b7b;
+  --color-sl-on_surface_1: #e0e0e0;
+  --color-sl-on_surface_2: #a0a0a0;
+  --color-sl-01dpa: rgba(255, 255, 255, 0.05);
+  --color-sl-02dpa: rgba(255, 255, 255, 0.07);
+  --color-sl-03dpa: rgba(255, 255, 255, 0.08);
+  --color-sl-04dpa: rgba(255, 255, 255, 0.09);
+  --color-sl-06dpa: rgba(255, 255, 255, 0.11);
+  --color-sl-08dpa: rgba(255, 255, 255, 0.12);
+  --color-sl-12dpa: rgba(255, 255, 255, 0.14);
+  --color-sl-16dpa: rgba(255, 255, 255, 0.15);
+  --color-sl-24dpa: rgba(255, 255, 255, 0.16);
+  --color-sl-01dp: #1e1e1e;
+  --color-sl-02dp: #232323;
+  --color-sl-03dp: #252525;
+  --color-sl-04dp: #272727;
+  --color-sl-06dp: #2c2c2c;
+  --color-sl-08dp: #2f2f2f;
+  --color-sl-12dp: #333;
+  --color-sl-16dp: #353535;
+  --color-sl-24dp: #383838;
+  --color-sl-pink: #f9114f;
+  --color-sl-red: #ff3918;
+  --color-sl-yellow: #ffe61e;
+  --color-sl-blue: #02f5ea;
+  --color-sl-darkblue: #02b7ff;
+  --color-sl-green: #8ce568;
+}
+
+/* paint background of level meter */
+.levels {
+  height: 100%;
+  width: 30px;
+  border-radius: 2px;
+  display: flex;
+  flex-direction: row;
+  padding: 2px 0px;
+  margin: auto;
+}
+
+/* paint not glowing LEDs */
+.level {
+  position: relative;
+  margin: 0 1px;
+  flex-grow: 1;
+  z-index: 3;
+  background-color: transparent;
+  background-repeat: repeat-y;
+  background-image: linear-gradient(to bottom, #202020 3px, transparent 1px);
+  background-size: 100% 4px;
+}
+
+/* paint glowing LEDs */
+.level:before {
+  width: 100%;
+  height: 100%;
+  content: ' ';
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  z-index: 1;
+  background-repeat: no-repeat;
+  background-image: linear-gradient(to top, green 0%, yellow 80%, red 100%);
+  background-size: 100% 100%;
+  clip-path: inset(var(--my-level)); /* switch off leds */
+  -webkit-clip-path: inset(var(--my-level)); /* Safari */
+}
+
+/* paint gap lines of LEDs */
+.level::after {
+  width: 100%;
+  height: 100%;
+  content: ' ';
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  z-index: 2;
+  margin-top: 3px;
+  background-image: linear-gradient(
+    to bottom,
+    #333 1px /* space between leds*/,
+    transparent 1px
+  );
+  background-repeat: repeat-y;
+  background-size: 100% 4px; /* 4px LED height */
+  background-color: transparent;
+}
+
diff --git a/webui/src/views/HomeView.vue b/webui/src/views/HomeView.vue
index 4d33054..b4f022e 100644
--- a/webui/src/views/HomeView.vue
+++ b/webui/src/views/HomeView.vue
@@ -33,8 +33,7 @@
         <main class="w-full pb-24">
           <WebrtcVideo />
           <audio id="live" autoplay></audio>
-          <Speakers />
-          <Listeners />
+          <Tracks />
         </main>
         <Chat />
       </div>
@@ -46,12 +45,11 @@
 
 <script setup lang="ts">
 import WebrtcVideo from '../components/WebrtcVideo.vue'
-import Speakers from '../components/Speakers.vue'
-import Listeners from '../components/Listeners.vue'
 import BottomActions from '../components/BottomActions.vue'
 import Chat from '../components/Chat.vue'
 import RecButton from '../components/RecButton.vue'
 import Calls from '../components/Calls.vue'
+import Tracks from '../components/Tracks/Tracks.vue'
 import api from '../api'
 import { onMounted } from 'vue'
 //import StudioNav from '../components/StudioNav.vue'
diff --git a/webui/src/ws/tracks.ts b/webui/src/ws/tracks.ts
new file mode 100644
index 0000000..e53d476
--- /dev/null
+++ b/webui/src/ws/tracks.ts
@@ -0,0 +1,196 @@
+import { reactive } from 'vue'
+import config from '../config'
+
+export enum LocalTrackStates {
+    Setup = 0,
+    SelectAudio,
+    Ready,
+}
+
+export enum TrackStatus {
+    IDLE = 0,
+    LOCAL_REGISTERING = 1,
+    LOCAL_REGISTER_OK = 2,
+    LOCAL_REGISTER_FAIL = 3,
+    LOCAL_AUDIO_READY = 4,
+    REMOTE_CONNECTED = 5,
+    REMOTE_CALLING = 6,
+    REMOTE_INCOMING = 7
+}
+
+interface Track {
+    id: number
+    name: string
+    status: TrackStatus
+    muted: boolean
+    error: string
+}
+
+interface State extends Track {
+    selected: boolean
+    local: LocalTrackStates
+}
+
+interface AudioDevice {
+    idx: number
+    name: string
+}
+
+interface AudioList {
+    src: AudioDevice[]
+    play: AudioDevice[]
+    src_dev: number
+    play_dev: number
+}
+
+interface LocalTrack extends Track {
+    audio: AudioList
+}
+
+interface Tracks {
+    socket?: WebSocket
+    state: State[]
+    local_tracks: LocalTrack[]
+    remote_tracks: Track[]
+    selected_debounce: boolean
+    clear_tracks(): void
+    /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+    update(tracks: any): void
+    getTrackName(id: number): string
+    websocket(): void
+    isValid(id: number): boolean
+    isSelected(id: number): boolean
+    isMuted(id: number): boolean
+    localState(id: number): LocalTrackStates
+    select(id: number): void
+    selected(): number,
+}
+
+export const Tracks: Tracks = {
+    state: reactive([]),
+    remote_tracks: reactive([]),
+    local_tracks: reactive([]),
+    selected_debounce: false,
+
+    getTrackName(id: number): string {
+        if (this.state[id] != undefined) {
+            return this.state[id].name.replace('sip:', '')
+        }
+        return 'error'
+    },
+
+    websocket(): void {
+        this.socket = new WebSocket(config.ws_host() + config.base() + 'ws/v1/tracks')
+        this.socket.onerror = function () {
+            console.log('Websocket error')
+        }
+        this.socket.onmessage = (message) => {
+            const tracks = JSON.parse(message.data)
+            this.update(tracks)
+        }
+        this.selected_debounce = false
+    },
+
+    clear_tracks(): void {
+        this.local_tracks.length = 0
+        this.remote_tracks.length = 0
+    },
+
+    update(tracks): void {
+        let last_key = 0
+        this.clear_tracks()
+
+        for (const key in tracks) {
+            tracks[key].id = parseInt(key)
+
+            /* Initialize frontend state only once */
+            if (this.state[tracks[key].id] === undefined) {
+                this.state[tracks[key].id] = {
+                    id: tracks[key].id,
+                    selected: false,
+                    status: TrackStatus.IDLE,
+                    error: "",
+                    local: LocalTrackStates.Setup,
+                    name: tracks[key].name,
+                    muted: tracks[key].muted
+                }
+                last_key = parseInt(key)
+            }
+
+            this.state[tracks[key].id].name = tracks[key].name
+            this.state[tracks[key].id].status = tracks[key].status
+            this.state[tracks[key].id].muted = tracks[key].muted
+
+            if (tracks[key].type == 'local') {
+                this.local_tracks.push(tracks[key])
+            }
+
+            if (tracks[key].type == 'remote') {
+                this.remote_tracks.push(tracks[key])
+            }
+        }
+
+        /* Cleanup state for deleted tracks */
+        for (const key in this.state) {
+            if (tracks[key] === undefined) {
+                delete this.state[key]
+            }
+        }
+
+        /* select last added track */
+        if (last_key > 0) {
+            this.select(last_key)
+        }
+    },
+
+    isValid(id: number): boolean {
+        if (this.state[id]) {
+            return true
+        }
+        return false
+    },
+
+    isSelected(id: number): boolean {
+        if (this.state[id]) {
+            return this.state[id].selected
+        }
+        return false
+    },
+
+    isMuted(id: number): boolean {
+        return this.state[id]?.muted
+    },
+
+    localState(id: number): LocalTrackStates {
+        return this.state[id].local
+    },
+
+    select(id: number): void {
+        if (this.state[id] === undefined)
+            return
+
+        //Workaround for mouseenter event after focus change
+        if (this.selected_debounce) return
+        this.selected_debounce = true
+        setTimeout(() => {
+            this.selected_debounce = false
+        }, 20)
+
+        this.state.forEach((el) => {
+            el.selected = false
+        })
+
+        this.state[id].selected = true
+    },
+
+    selected(): number {
+        let id = -1
+        this.state.forEach((el) => {
+            if (el.selected) {
+                id = el.id
+            }
+        })
+
+        return id
+    },
+}

From 51c791bf166d2a5b4f7e42e336fbafa63567cf9e Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Thu, 2 Apr 2026 21:52:47 +0200
Subject: [PATCH 12/26] wip: add contacts

---
 .gitignore       |  4 ++++
 CMakeLists.txt   |  2 +-
 src/main.c       |  1 +
 src/mix.c        |  2 ++
 src/tracks.c     | 28 ++++++++++++++++++++--------
 webui/src/api.ts |  2 +-
 6 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 42c8c3c..7713d52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,7 @@
 node_modules
 
 re_trace.json
+
+config
+contacts
+current_contact
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b26750..c5addee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,7 @@ set(REM_LIBRARY rem CACHE STRING "rem_library")
 set(STATIC ON CACHE BOOL "Build static")
 set(APP_MODULES_DIR ${CMAKE_SOURCE_DIR}/modules)
 set(APP_MODULES amix vmix)
-set(MODULES ice dtls_srtp turn opus vp8 avcodec fakevideo auresamp CACHE STRING "")
+set(MODULES ice dtls_srtp turn opus vp8 avcodec fakevideo auresamp contact CACHE STRING "")
 
 add_subdirectory(external/re EXCLUDE_FROM_ALL)
 add_subdirectory(external/baresip EXCLUDE_FROM_ALL)
diff --git a/src/main.c b/src/main.c
index af838d0..bc68db0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,6 +6,7 @@
 static const char *modv[] = {
 	"ice",
 	"dtls_srtp",
+	"contact",
 
 	/* audio */
 	"amix",
diff --git a/src/mix.c b/src/mix.c
index e017c24..c7d3b44 100644
--- a/src/mix.c
+++ b/src/mix.c
@@ -213,6 +213,8 @@ int slmix_config(char *file)
 		err = 0;
 	}
 
+	conf_path_set(mix.path);
+
 	info("slmix_config path: %s\n", mix.path);
 
 out:
diff --git a/src/tracks.c b/src/tracks.c
index a2da837..b275845 100644
--- a/src/tracks.c
+++ b/src/tracks.c
@@ -207,10 +207,26 @@ int sl_track_dial(struct sl_track *track, struct pl *peer)
 
 	track->error[0] = '\0';
 
-	err = account_uri_complete_strdup(ua_account(slmix_sip_ua()), &peerc,
-					  peer);
-	if (err)
-		goto out;
+	const struct contacts *cs = baresip_contacts();
+
+	for (struct le *le = list_head(contact_list(cs)); le; le = le->next) {
+		struct contact *c  = le->data;
+		struct sip_addr *a = contact_addr(c);
+		if (!a)
+			continue;
+
+		if (pl_casecmp(peer, &a->dname) == 0) {
+			str_dup(&peerc, contact_uri(c));
+			break;
+		}
+	}
+
+	if (!peerc) {
+		err = account_uri_complete_strdup(ua_account(slmix_sip_ua()),
+						  &peerc, peer);
+		if (err)
+			goto out;
+	}
 
 	err = ua_connect(slmix_sip_ua(), &track->u.remote.call, NULL, peerc,
 			 VIDMODE_OFF);
@@ -219,9 +235,6 @@ int sl_track_dial(struct sl_track *track, struct pl *peer)
 
 	track->status = SL_TRACK_REMOTE_CALLING;
 	pl_strcpy(peer, track->name, sizeof(track->name));
-	char buf[ITOA_BUFSZ];
-	char *id = str_itoa(track->id, buf, 10);
-	audio_set_devicename(call_audio(track->u.remote.call), id, id);
 
 out:
 	if (err)
@@ -269,7 +282,6 @@ void sl_track_toggle_mute(struct sl_track *track)
 		return;
 
 	local_track->muted = !local_track->muted;
-	//sl_audio_mute(local_track->u.local.slaudio, local_track->muted);
 	sl_track_ws_send();
 }
 
diff --git a/webui/src/api.ts b/webui/src/api.ts
index a7460f7..44c668d 100644
--- a/webui/src/api.ts
+++ b/webui/src/api.ts
@@ -225,6 +225,6 @@ export default {
     },
 
     async track_dial(track: number, peer: string) {
-        api_fetch('POST', '/tracks/dial?track=' + String(track), peer);
+        api_fetch('POST', '/tracks/dial?track=' + String(track), peer, false);
     }
 }

From 1bf408b6b16f3dddb7c4bc5f80322b93ef5ded45 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Thu, 2 Apr 2026 21:53:15 +0200
Subject: [PATCH 13/26] wip/webui: fix buttons and fonts

---
 webui/package-lock.json                         | 7 +++++++
 webui/package.json                              | 5 +++--
 webui/src/components/ButtonPrimary.vue          | 7 +++++++
 webui/src/components/ButtonSecondary.vue        | 7 +++++++
 webui/src/components/Tracks/RemoteTrack.vue     | 2 +-
 webui/src/components/Tracks/RemoteTrackCall.vue | 1 +
 webui/src/main.ts                               | 6 ++++++
 7 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 webui/src/components/ButtonPrimary.vue
 create mode 100644 webui/src/components/ButtonSecondary.vue

diff --git a/webui/package-lock.json b/webui/package-lock.json
index da086bf..3f85956 100644
--- a/webui/package-lock.json
+++ b/webui/package-lock.json
@@ -17,6 +17,7 @@
         "@vueuse/core": "^14.2.1",
         "cropperjs": "2.1.0",
         "markdown-it": "^14.0.0",
+        "typeface-roboto-mono": "^1.1.13",
         "vue": "^3.2.41",
         "vue-router": "^5.0.3",
         "vue3-avataaars": "^1.0.12",
@@ -4176,6 +4177,12 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/typeface-roboto-mono": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/typeface-roboto-mono/-/typeface-roboto-mono-1.1.13.tgz",
+      "integrity": "sha512-pnzDc70b7ywJHin/BUFL7HZX8DyOTBLT2qxlJ92eH1UJOFcENIBXa9IZrxsJX/gEKjbEDKhW5vz/TKRBNk/ufQ==",
+      "license": "MIT"
+    },
     "node_modules/typescript": {
       "version": "5.9.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
diff --git a/webui/package.json b/webui/package.json
index 804a618..36980d0 100644
--- a/webui/package.json
+++ b/webui/package.json
@@ -20,6 +20,7 @@
     "@vueuse/core": "^14.2.1",
     "cropperjs": "2.1.0",
     "markdown-it": "^14.0.0",
+    "typeface-roboto-mono": "^1.1.13",
     "vue": "^3.2.41",
     "vue-router": "^5.0.3",
     "vue3-avataaars": "^1.0.12",
@@ -33,11 +34,11 @@
     "@vitejs/plugin-vue": "^6.0.2",
     "@vue/eslint-config-prettier": "^10.1.0",
     "@vue/eslint-config-typescript": "^14.1.4",
+    "@vue/tsconfig": "^0.8.1",
     "eslint-plugin-vue": "^10.8.0",
     "tailwindcss": "^4.0.8",
     "typescript": "~5.9.3",
     "vite": "^7.3.1",
-    "vue-tsc": "^3.1.5",
-    "@vue/tsconfig": "^0.8.1"
+    "vue-tsc": "^3.1.5"
   }
 }
diff --git a/webui/src/components/ButtonPrimary.vue b/webui/src/components/ButtonPrimary.vue
new file mode 100644
index 0000000..fc541e4
--- /dev/null
+++ b/webui/src/components/ButtonPrimary.vue
@@ -0,0 +1,7 @@
+<template>
+  <button
+    class="inline-flex text-sm items-center bg-sl-primary rounded-lg px-4 py-3 text-black font-bold leading-none uppercase tracking-wide hover:bg-sl-primary_h focus:shadow-outline-gray"
+  >
+    <slot></slot>
+  </button>
+</template>
diff --git a/webui/src/components/ButtonSecondary.vue b/webui/src/components/ButtonSecondary.vue
new file mode 100644
index 0000000..124972b
--- /dev/null
+++ b/webui/src/components/ButtonSecondary.vue
@@ -0,0 +1,7 @@
+<template>
+  <button
+    class="inline-flex text-sm items-center bg-sl-surface rounded-lg px-4 py-3 text-sl-primary font-bold leading-none uppercase tracking-wide hover:text-black hover:bg-sl-primary focus:shadow-outline-gray"
+  >
+    <slot></slot>
+  </button>
+</template>
diff --git a/webui/src/components/Tracks/RemoteTrack.vue b/webui/src/components/Tracks/RemoteTrack.vue
index 4d1503b..5835333 100644
--- a/webui/src/components/Tracks/RemoteTrack.vue
+++ b/webui/src/components/Tracks/RemoteTrack.vue
@@ -13,7 +13,7 @@
         </div>
 
         <div class="flex mt-1">
-            <div class="relative bg-sl-02dpa rounded-lg min-h-[10em] w-full shadow-sm pb-2">
+            <div class="relative bg-sl-02dpa rounded-lg min-h-[12em] w-full shadow-sm pb-2">
                 <div class="flex justify-between items-center">
                     <div :id="`track${pkey}`" ref="tid" tabindex="0" @focus="setActive()"
                         :class="[isActive() ? 'bg-sl-disabled' : 'bg-sl-24dpa']"
diff --git a/webui/src/components/Tracks/RemoteTrackCall.vue b/webui/src/components/Tracks/RemoteTrackCall.vue
index 6b5f522..1842483 100644
--- a/webui/src/components/Tracks/RemoteTrackCall.vue
+++ b/webui/src/components/Tracks/RemoteTrackCall.vue
@@ -49,6 +49,7 @@
         </ButtonSecondary>
     </div>
     <div v-if="isOnCall()" class="text-center">
+        <video></video>
         <svg class="w-24 h-24 fill-yellow-800 mx-auto"
         xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
         <path
diff --git a/webui/src/main.ts b/webui/src/main.ts
index 27d7be9..da2fe60 100644
--- a/webui/src/main.ts
+++ b/webui/src/main.ts
@@ -2,10 +2,16 @@ import { createApp } from 'vue'
 import './index.css'
 import App from './App.vue'
 import router from './router'
+import ButtonPrimary from "./components/ButtonPrimary.vue";
+import ButtonSecondary from "./components/ButtonSecondary.vue";
 import './shortcuts'
+import "typeface-roboto-mono";
 
 const app = createApp(App)
 
+app.component("ButtonPrimary", ButtonPrimary);
+app.component("ButtonSecondary", ButtonSecondary);
+
 app.use(router)
 
 app.mount('#app')

From d91e24d6f96cb546020da6132d4cf48a95a41a53 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Fri, 3 Apr 2026 20:35:47 +0200
Subject: [PATCH 14/26] wip: more tracks refactoring

---
 modules/vmix/vmix.c                           |  4 +-
 src/http.c                                    | 12 ++-
 src/tracks.c                                  | 16 +++-
 src/ws.c                                      |  3 +
 .../src/components/Tracks/RemoteTrackCall.vue |  7 +-
 .../components/Tracks/RemoteTrackSettings.vue |  4 +-
 webui/src/components/WebrtcVideo.vue          |  2 +-
 webui/src/shortcuts.ts                        | 76 +++++++++----------
 8 files changed, 69 insertions(+), 55 deletions(-)

diff --git a/modules/vmix/vmix.c b/modules/vmix/vmix.c
index 408afbc..742833d 100644
--- a/modules/vmix/vmix.c
+++ b/modules/vmix/vmix.c
@@ -113,8 +113,10 @@ static uint32_t disp_enable_h(const char *device, bool enable)
 		return 0;
 
 	src = vmix_src_find(device);
-	if (!src)
+	if (!src) {
+		warning("disp_enable: device %s not found\n", device);
 		return 0;
+	}
 
 	vidmix_source_enable(src->vidmix_src, enable);
 
diff --git a/src/http.c b/src/http.c
index 80a9ca2..2e8b40e 100644
--- a/src/http.c
+++ b/src/http.c
@@ -644,7 +644,7 @@ static void http_req_handler(struct http_conn *conn,
 
 	ROUTE("/api/v1/webrtc/focus", "PUT")
 	{
-		char user[USERID_SZ] = {0};
+		char user[64] = {0};
 		struct pl user_id    = PL_INIT;
 
 		/* check permission */
@@ -652,11 +652,13 @@ static void http_req_handler(struct http_conn *conn,
 			goto err;
 
 		err = re_regex((char *)mbuf_buf(msg->mb),
-			       mbuf_get_left(msg->mb), "[a-zA-Z0-9@:]+",
+			       mbuf_get_left(msg->mb), "[a-zA-Z0-9@.:]+",
 			       &user_id);
 		if (err)
 			goto err;
 
+		warning("focus %r\n", &user_id);
+
 		pl_strcpy(&user_id, user, sizeof(user));
 
 		vmix_disp_focus(user);
@@ -667,7 +669,7 @@ static void http_req_handler(struct http_conn *conn,
 
 	ROUTE("/api/v1/webrtc/solo/enable", "PUT")
 	{
-		char user[USERID_SZ] = {0};
+		char user[64] = {0};
 		struct pl user_id    = PL_INIT;
 
 		/* check permission */
@@ -677,8 +679,10 @@ static void http_req_handler(struct http_conn *conn,
 		err = re_regex((char *)mbuf_buf(msg->mb),
 			       mbuf_get_left(msg->mb), "[a-zA-Z0-9@:]+",
 			       &user_id);
-		if (err)
+		if (err) {
+			warning("solo regex err %m\n", err);
 			goto err;
+		}
 
 		pl_strcpy(&user_id, user, sizeof(user));
 
diff --git a/src/tracks.c b/src/tracks.c
index b275845..e5550c9 100644
--- a/src/tracks.c
+++ b/src/tracks.c
@@ -229,7 +229,7 @@ int sl_track_dial(struct sl_track *track, struct pl *peer)
 	}
 
 	err = ua_connect(slmix_sip_ua(), &track->u.remote.call, NULL, peerc,
-			 VIDMODE_OFF);
+			 VIDMODE_ON);
 	if (err)
 		goto out;
 
@@ -397,11 +397,21 @@ static void eventh(enum bevent_ev ev, struct bevent *event, void *arg)
 		if (ev == BEVENT_CALL_RINGING) {
 			track->status = SL_TRACK_REMOTE_CALLING;
 			changed	      = true;
+			const char *peer = call_peeruri(call);
+			audio_set_devicename(call_audio(call), peer, peer);
+			video_set_devicename(call_video(call), peer, peer);
 		}
 
 		if (ev == BEVENT_CALL_ESTABLISHED) {
-			track->status = SL_TRACK_REMOTE_CONNECTED;
-			changed	      = true;
+			track->status	 = SL_TRACK_REMOTE_CONNECTED;
+			changed		 = true;
+			const char *peer = call_peeruri(call);
+			struct mix *mix = slmix();
+
+			slmix_source_append_all(mix, call, peer);
+			slmix_disp_enable(mix, peer, true);
+
+			info("track: call with '%s' established\n", peer);
 		}
 
 		if (ev == BEVENT_CALL_CLOSED) {
diff --git a/src/ws.c b/src/ws.c
index bba9559..1888b96 100644
--- a/src/ws.c
+++ b/src/ws.c
@@ -125,6 +125,9 @@ int sl_ws_open(enum ws_type type, struct http_conn *httpc,
 
 	list_append(&wsl, &ws_conn->le, ws_conn);
 
+	if (type == WS_TRACKS)
+		sl_track_ws_send();
+
 	if (type != WS_USERS)
 		goto out;
 
diff --git a/webui/src/components/Tracks/RemoteTrackCall.vue b/webui/src/components/Tracks/RemoteTrackCall.vue
index 1842483..bb4360a 100644
--- a/webui/src/components/Tracks/RemoteTrackCall.vue
+++ b/webui/src/components/Tracks/RemoteTrackCall.vue
@@ -49,12 +49,7 @@
         </ButtonSecondary>
     </div>
     <div v-if="isOnCall()" class="text-center">
-        <video></video>
-        <svg class="w-24 h-24 fill-yellow-800 mx-auto"
-        xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
-        <path
-        d="M224 32C135.6 32 64 103.6 64 192v16c0 8.8-7.2 16-16 16s-16-7.2-16-16V192C32 86 118 0 224 0S416 86 416 192v16c0 61.9-50.1 112-112 112H240 224 208c-17.7 0-32-14.3-32-32s14.3-32 32-32h32c17.7 0 32 14.3 32 32h32c44.2 0 80-35.8 80-80V192c0-88.4-71.6-160-160-160zM96 192c0-70.7 57.3-128 128-128s128 57.3 128 128c0 13.9-2.2 27.3-6.3 39.8C337.4 246.3 321.8 256 304 256h-8.6c-11.1-19.1-31.7-32-55.4-32H208c-35.3 0-64 28.7-64 64c0 1.4 0 2.7 .1 4C114.8 268.6 96 232.5 96 192zM224 352h16 64 9.6C387.8 352 448 412.2 448 486.4c0 14.1-11.5 25.6-25.6 25.6H25.6C11.5 512 0 500.5 0 486.4C0 412.2 60.2 352 134.4 352H208h16z" />
-        </svg>
+        <video :id="'source' + idx" playsinline autoplay muted preload="none"></video>
         <ButtonSecondary v-if="isActive()" class="mt-2" @click="api.track_hangup(pkey)">
         Hangup
         </ButtonSecondary>
diff --git a/webui/src/components/Tracks/RemoteTrackSettings.vue b/webui/src/components/Tracks/RemoteTrackSettings.vue
index e9faa8c..2255759 100644
--- a/webui/src/components/Tracks/RemoteTrackSettings.vue
+++ b/webui/src/components/Tracks/RemoteTrackSettings.vue
@@ -16,12 +16,12 @@
                 class="absolute right-0 z-10 mt-2 w-56 origin-top-right divide-y divide-neutral-800 rounded-md shadow-lg ring-1 ring-black ring-opacity-5 bg-sl-06dp text-sl-on_surface_2">
                 <div class="py-1">
                     <MenuItem v-slot="{ active }">
-                    <a href="#" @click="deleteTrack()" :class="[active ? 'bg-sl-01dp' : '', 'group flex items-center px-4 py-2 text-sm']">
+                    <button @click="deleteTrack()" :class="[active ? 'bg-sl-01dp' : '', 'group flex items-center px-4 py-2 text-sm w-full']">
 
                         <TrashIcon class="mr-3 h-5 w-5 text-neutral-400 group-hover:text-neutral-500"
                             aria-hidden="true" />
                         Delete Track
-                    </a>
+                    </button>
                     </MenuItem>
                 </div>
             </MenuItems>
diff --git a/webui/src/components/WebrtcVideo.vue b/webui/src/components/WebrtcVideo.vue
index 38a67ba..b680fa7 100644
--- a/webui/src/components/WebrtcVideo.vue
+++ b/webui/src/components/WebrtcVideo.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex">
-    <div v-show="Webrtc.state.value >= WebrtcState.Listening" class="w-1/3 mr-2">
+    <div v-if=0 v-show="Webrtc.state.value >= WebrtcState.Listening" class="w-1/3 mr-2">
       <div v-for="item in sources" class="my-1">
         <video :id="'source' + item.rtc?.id" playsinline autoplay muted preload="none"></video>
         <div>
diff --git a/webui/src/shortcuts.ts b/webui/src/shortcuts.ts
index 201e0fb..c232d43 100644
--- a/webui/src/shortcuts.ts
+++ b/webui/src/shortcuts.ts
@@ -2,45 +2,45 @@ import api from './api'
 import { State } from './ws/state'
 
 function solo_source(index: number) {
-  const dev = State.sources.value[index].dev
-  api.video_solo(dev, true)
-  State.sources.value.forEach((item) => {
-    if (dev === item.dev) item.solo = true
-    else item.solo = false
-  })
+    const dev = State.sources.value[index].dev
+    api.source_focus(dev)
+    State.sources.value.forEach((item) => {
+        if (dev === item.dev) item.solo = true
+        else item.solo = false
+    })
 }
 
 document.onkeydown = (event) => {
-	//ignore global events if input field is focused
-	const inputs = document.getElementsByTagName('input');
-	for (let i = 0, len = inputs.length; i < len; i++) {
-		const input = inputs[i];
-		if (input === document.activeElement)
-			return
-	}
-	const textareas = document.getElementsByTagName('textarea');
-	for (let i = 0, len = textareas.length; i < len; i++) {
-		const textarea = textareas[i];
-		if (textarea === document.activeElement)
-			return
-	}
-	// --- Track shortcuts ---
-	if (event.code == 'Digit1') {
-        solo_source(0)
-	}
-	if (event.code == 'Digit2') {
-        solo_source(1)
-	}
-	if (event.code == 'Digit3') {
-        solo_source(2)
-	}
-	if (event.code == 'Digit4') {
-        solo_source(3)
-	}
-	if (event.code == 'Digit5') {
-        solo_source(4)
-	}
-	if (event.code == 'Digit6') {
-        solo_source(5)
-	}
+    if (document.activeElement?.tagName === 'INPUT')
+        return
+
+    if (document.activeElement?.tagName === 'TEXTAREA')
+        return
+
+    switch (event.code) {
+        case "Digit1":
+            solo_source(0)
+            break
+        case "Digit2":
+            solo_source(1)
+            break
+        case "Digit3":
+            solo_source(2)
+            break
+        case "Digit4":
+            solo_source(3)
+            break
+        case "Digit5":
+            solo_source(4)
+            break
+        case "Digit6":
+            solo_source(5)
+            break
+        case "Digit7":
+            solo_source(6)
+            break
+        case "Digit8":
+            solo_source(7)
+            break
+    }
 }

From 33c4a19affe6356302c1ce472dc5c0fb1d8615be Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Sat, 4 Apr 2026 11:52:22 +0200
Subject: [PATCH 15/26] wip: remote track webrtc fixes

---
 include/mix.h |  2 +-
 src/http.c    | 25 ++++++++++++++++++++-----
 src/source.c  | 19 +++++++++++++++++--
 src/tracks.c  | 24 ++++++++++++++++--------
 4 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/include/mix.h b/include/mix.h
index 6eb5fa5..d2046f5 100644
--- a/include/mix.h
+++ b/include/mix.h
@@ -307,7 +307,7 @@ struct sl_local {
 struct sl_remote {
 	struct call *call;
 };
-enum sl_track_type { SL_TRACK_REMOTE, SL_TRACK_LOCAL };
+enum sl_track_type { SL_TRACK_REMOTE, SL_TRACK_REMOTE_RTC, SL_TRACK_LOCAL };
 enum sl_track_status {
 	SL_TRACK_INVALID	     = -1,
 	SL_TRACK_IDLE		     = 0,
diff --git a/src/http.c b/src/http.c
index 2e8b40e..498098f 100644
--- a/src/http.c
+++ b/src/http.c
@@ -243,6 +243,9 @@ static void http_req_handler(struct http_conn *conn,
 
 	ROUTE("/api/v1/tracks/remote", "POST")
 	{
+		if (!sess->user->host)
+			goto auth;
+
 		struct sl_track *track;
 
 		err = sl_track_add(&track, SL_TRACK_REMOTE);
@@ -257,7 +260,10 @@ static void http_req_handler(struct http_conn *conn,
 
 	ROUTE("/api/v1/tracks", "DELETE")
 	{
-		struct pl pltrack = {"3", 2};
+		if (!sess->user->host)
+			goto auth;
+
+		struct pl pltrack = PL_INIT;
 		err = re_regex((char *)mbuf_buf(msg->mb),
 			       mbuf_get_left(msg->mb), "[0-9]+", &pltrack);
 		int32_t id = pl_i32(&pltrack);
@@ -274,6 +280,9 @@ static void http_req_handler(struct http_conn *conn,
 
 	ROUTE("/api/v1/tracks/accept", "POST")
 	{
+		if (!sess->user->host)
+			goto auth;
+
 		struct pl pltrack = PL_INIT;
 
 		err = re_regex(msg->prm.p, msg->prm.l, "track=[0-9]+",
@@ -291,6 +300,9 @@ static void http_req_handler(struct http_conn *conn,
 
 	ROUTE("/api/v1/tracks/hangup", "POST")
 	{
+		if (!sess->user->host)
+			goto auth;
+
 		struct pl pltrack = PL_INIT;
 
 		err = re_regex(msg->prm.p, msg->prm.l, "track=[0-9]+",
@@ -308,6 +320,9 @@ static void http_req_handler(struct http_conn *conn,
 
 	ROUTE("/api/v1/tracks/dial", "POST")
 	{
+		if (!sess->user->host)
+			goto auth;
+
 		struct pl pltrack = PL_INIT;
 		struct pl peer;
 
@@ -644,8 +659,8 @@ static void http_req_handler(struct http_conn *conn,
 
 	ROUTE("/api/v1/webrtc/focus", "PUT")
 	{
-		char user[64] = {0};
-		struct pl user_id    = PL_INIT;
+		char user[64]	  = {0};
+		struct pl user_id = PL_INIT;
 
 		/* check permission */
 		if (!sess->user->host)
@@ -669,8 +684,8 @@ static void http_req_handler(struct http_conn *conn,
 
 	ROUTE("/api/v1/webrtc/solo/enable", "PUT")
 	{
-		char user[64] = {0};
-		struct pl user_id    = PL_INIT;
+		char user[64]	  = {0};
+		struct pl user_id = PL_INIT;
 
 		/* check permission */
 		if (!sess->user->host)
diff --git a/src/source.c b/src/source.c
index 3db58bf..5aeaaab 100644
--- a/src/source.c
+++ b/src/source.c
@@ -156,18 +156,33 @@ static void source_dealloc(void *arg)
 
 static int32_t source_id_next(struct source_pc *src)
 {
+	int32_t next_id = 0;
 	if (!src || !src->sess)
 		return -1;
 
 	if (!src->sess->source_pcl.tail)
-		return 0;
+		goto out;
 
 	struct source_pc *last = src->sess->source_pcl.tail->data;
 
 	if (!last)
 		return -1;
 
-	return last->id + 1;
+	next_id = last->id + 1;
+
+out:
+	struct sl_track *track = sl_track_by_id(next_id + 1);
+	if (!track) {
+		sl_track_add(&track, SL_TRACK_REMOTE_RTC);
+		track->status = SL_TRACK_REMOTE_CONNECTED;
+	}
+	else {
+		track->type   = SL_TRACK_REMOTE_RTC;
+		track->status = SL_TRACK_REMOTE_CONNECTED;
+	}
+	sl_track_ws_send();
+
+	return next_id;
 }
 
 
diff --git a/src/tracks.c b/src/tracks.c
index e5550c9..07fa3eb 100644
--- a/src/tracks.c
+++ b/src/tracks.c
@@ -42,7 +42,8 @@ int sl_tracks_json(struct re_printf *pf, void *arg)
 		if (err)
 			return ENOMEM;
 
-		if (track->type == SL_TRACK_REMOTE) {
+		if (track->type == SL_TRACK_REMOTE ||
+		    track->type == SL_TRACK_REMOTE_RTC) {
 			odict_entry_add(o_track, "type", ODICT_STRING,
 					"remote");
 		}
@@ -202,9 +203,10 @@ int sl_track_dial(struct sl_track *track, struct pl *peer)
 	int err;
 	char *peerc = NULL;
 
-	if (!track || track->type != SL_TRACK_REMOTE)
+	if (!track)
 		return EINVAL;
 
+	track->type = SL_TRACK_REMOTE;
 	track->error[0] = '\0';
 
 	const struct contacts *cs = baresip_contacts();
@@ -264,11 +266,17 @@ void sl_track_accept(struct sl_track *track)
 
 void sl_track_hangup(struct sl_track *track)
 {
-	if (!track || track->type != SL_TRACK_REMOTE)
+	if (!track)
 		return;
 
-	ua_hangup(call_get_ua(track->u.remote.call), track->u.remote.call, 0,
-		  "");
+	warning("hangup %d\n", track->type);
+
+	if (track->type == SL_TRACK_REMOTE)
+		ua_hangup(call_get_ua(track->u.remote.call),
+			  track->u.remote.call, 0, "");
+
+	if (track->type == SL_TRACK_REMOTE_RTC)
+		track->status = SL_TRACK_IDLE;
 
 	track->name[0]	     = '\0';
 	track->u.remote.call = NULL;
@@ -395,8 +403,8 @@ static void eventh(enum bevent_ev ev, struct bevent *event, void *arg)
 
 
 		if (ev == BEVENT_CALL_RINGING) {
-			track->status = SL_TRACK_REMOTE_CALLING;
-			changed	      = true;
+			track->status	 = SL_TRACK_REMOTE_CALLING;
+			changed		 = true;
 			const char *peer = call_peeruri(call);
 			audio_set_devicename(call_audio(call), peer, peer);
 			video_set_devicename(call_video(call), peer, peer);
@@ -406,7 +414,7 @@ static void eventh(enum bevent_ev ev, struct bevent *event, void *arg)
 			track->status	 = SL_TRACK_REMOTE_CONNECTED;
 			changed		 = true;
 			const char *peer = call_peeruri(call);
-			struct mix *mix = slmix();
+			struct mix *mix	 = slmix();
 
 			slmix_source_append_all(mix, call, peer);
 			slmix_disp_enable(mix, peer, true);

From 18bea544f561a45529187c40893af49f9c9ab0f9 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Sat, 4 Apr 2026 20:26:38 +0200
Subject: [PATCH 16/26] wip: fix solo and add track session

---
 include/mix.h          |  1 +
 src/sess.c             |  8 ++++++
 src/tracks.c           | 65 ++++++++++++++++++++++++++++++------------
 webui/src/shortcuts.ts |  2 +-
 4 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/include/mix.h b/include/mix.h
index d2046f5..c28a39c 100644
--- a/include/mix.h
+++ b/include/mix.h
@@ -306,6 +306,7 @@ struct sl_local {
 /* Remote audio call track */
 struct sl_remote {
 	struct call *call;
+	struct session *sess;
 };
 enum sl_track_type { SL_TRACK_REMOTE, SL_TRACK_REMOTE_RTC, SL_TRACK_LOCAL };
 enum sl_track_status {
diff --git a/src/sess.c b/src/sess.c
index 9fa5fc5..041db40 100644
--- a/src/sess.c
+++ b/src/sess.c
@@ -229,6 +229,9 @@ int slmix_session_alloc(struct session **sessp, struct mix *mix,
 	struct session *sess;
 	struct user *user;
 
+	if (!sessp)
+		return EINVAL;
+
 	sess = mem_zalloc(sizeof(*sess), destructor);
 	if (!sess)
 		return ENOMEM;
@@ -246,6 +249,11 @@ int slmix_session_alloc(struct session **sessp, struct mix *mix,
 		pl_strcpy(user_id, user->id, sizeof(user->id));
 		sess->auth = true;
 	}
+	else if (user_id) {
+		info("session: create new with user %r\n", user_id);
+		rand_str(sess->id, sizeof(sess->id));
+		pl_strcpy(user_id, user->id, sizeof(user->id));
+	}
 	else {
 		/* generate a unique session and user id */
 		info("session: create new\n");
diff --git a/src/tracks.c b/src/tracks.c
index 07fa3eb..61d8ffb 100644
--- a/src/tracks.c
+++ b/src/tracks.c
@@ -206,7 +206,7 @@ int sl_track_dial(struct sl_track *track, struct pl *peer)
 	if (!track)
 		return EINVAL;
 
-	track->type = SL_TRACK_REMOTE;
+	track->type	= SL_TRACK_REMOTE;
 	track->error[0] = '\0';
 
 	const struct contacts *cs = baresip_contacts();
@@ -218,7 +218,7 @@ int sl_track_dial(struct sl_track *track, struct pl *peer)
 			continue;
 
 		if (pl_casecmp(peer, &a->dname) == 0) {
-			str_dup(&peerc, contact_uri(c));
+			str_dup(&peerc, contact_str(c));
 			break;
 		}
 	}
@@ -391,9 +391,13 @@ static void eventh(enum bevent_ev ev, struct bevent *event, void *arg)
 		return;
 	}
 
+	struct mix *mix = slmix();
+
 	LIST_FOREACH(&tracks, le)
 	{
 		struct sl_track *track = le->data;
+		const char *peername   = NULL;
+		struct pl peername_pl  = PL_INIT;
 
 		if (track->type != SL_TRACK_REMOTE)
 			continue;
@@ -401,28 +405,48 @@ static void eventh(enum bevent_ev ev, struct bevent *event, void *arg)
 		if (track->u.remote.call != call)
 			continue;
 
+		switch (ev) {
+		case BEVENT_CALL_RINGING:
+			track->status = SL_TRACK_REMOTE_CALLING;
+			changed	      = true;
+			peername      = call_peername(call);
+			pl_set_str(&peername_pl, peername);
+
+			audio_set_devicename(call_audio(call), peername,
+					     peername);
+			video_set_devicename(call_video(call), peername,
+					     peername);
+			break;
 
-		if (ev == BEVENT_CALL_RINGING) {
-			track->status	 = SL_TRACK_REMOTE_CALLING;
-			changed		 = true;
-			const char *peer = call_peeruri(call);
-			audio_set_devicename(call_audio(call), peer, peer);
-			video_set_devicename(call_video(call), peer, peer);
-		}
+		case BEVENT_CALL_ESTABLISHED:
+			track->status = SL_TRACK_REMOTE_CONNECTED;
+			changed	      = true;
+			peername      = call_peername(call);
+			pl_set_str(&peername_pl, peername);
 
-		if (ev == BEVENT_CALL_ESTABLISHED) {
-			track->status	 = SL_TRACK_REMOTE_CONNECTED;
-			changed		 = true;
-			const char *peer = call_peeruri(call);
-			struct mix *mix	 = slmix();
+			int err = slmix_session_alloc(
+				&track->u.remote.sess, mix, NULL, &peername_pl,
+				&peername_pl, false, true);
+			if (err)
+				break;
 
-			slmix_source_append_all(mix, call, peer);
-			slmix_disp_enable(mix, peer, true);
+			slmix_source_append_all(mix, call, peername);
 
-			info("track: call with '%s' established\n", peer);
-		}
+			amix_mute(peername, false, ++mix->next_speaker_id);
+			track->u.remote.sess->call	  = call;
+			track->u.remote.sess->connected	  = true;
+			track->u.remote.sess->user->video = true;
+
+			track->u.remote.sess->user->pidx =
+				slmix_disp_enable(mix, peername, true);
+			slmix_disp_enable(mix, peername, true);
 
-		if (ev == BEVENT_CALL_CLOSED) {
+			warning("track: call with '%s' established\n",
+				peername);
+			break;
+
+		case BEVENT_CALL_CLOSED:
+			track->u.remote.sess = mem_deref(track->u.remote.sess);
 			track->status	     = SL_TRACK_IDLE;
 			track->u.remote.call = NULL;
 			track->name[0]	     = '\0';
@@ -430,6 +454,9 @@ static void eventh(enum bevent_ev ev, struct bevent *event, void *arg)
 				str_ncpy(track->error, prm,
 					 sizeof(track->error));
 			changed = true;
+			break;
+
+		default:
 		}
 	}
 
diff --git a/webui/src/shortcuts.ts b/webui/src/shortcuts.ts
index c232d43..ced8a45 100644
--- a/webui/src/shortcuts.ts
+++ b/webui/src/shortcuts.ts
@@ -3,7 +3,7 @@ import { State } from './ws/state'
 
 function solo_source(index: number) {
     const dev = State.sources.value[index].dev
-    api.source_focus(dev)
+    api.video_solo(dev, true)
     State.sources.value.forEach((item) => {
         if (dev === item.dev) item.solo = true
         else item.solo = false

From 4050aafac05a5951147185b9c78422ff4189fdcc Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Sat, 4 Apr 2026 20:31:27 +0200
Subject: [PATCH 17/26] stats: increase metrics timer

---
 src/stats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stats.c b/src/stats.c
index 526fcc6..91149ee 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -205,7 +205,7 @@ static void slmix_metrics(void *arg)
 	mbuf_rewind(mb_stats);
 
 out:
-	tmr_start(&tmr_metrics, 2000, slmix_metrics, NULL);
+	tmr_start(&tmr_metrics, 6000, slmix_metrics, NULL);
 }
 
 

From 755d103090a45aa37a450c20de7e3b450b95afaf Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Sun, 5 Apr 2026 09:11:29 +0200
Subject: [PATCH 18/26] wip: source handling rtc

---
 src/source.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/source.c b/src/source.c
index 5aeaaab..9387a4e 100644
--- a/src/source.c
+++ b/src/source.c
@@ -173,10 +173,12 @@ static int32_t source_id_next(struct source_pc *src)
 out:
 	struct sl_track *track = sl_track_by_id(next_id + 1);
 	if (!track) {
+		info("track/source add %d/%d, RTC\n", track->id, next_id);
 		sl_track_add(&track, SL_TRACK_REMOTE_RTC);
 		track->status = SL_TRACK_REMOTE_CONNECTED;
 	}
-	else {
+	else if (track->status == SL_TRACK_IDLE) {
+		info("track/source update %d/%d, RTC\n", track->id, next_id);
 		track->type   = SL_TRACK_REMOTE_RTC;
 		track->status = SL_TRACK_REMOTE_CONNECTED;
 	}

From b737860caf65305c3ad98ffb691e47b92154056c Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Sun, 5 Apr 2026 09:48:15 +0200
Subject: [PATCH 19/26] wip: source/tracks next_id

---
 include/mix.h |  1 +
 src/source.c  | 40 +++++++++++++++++++---------------------
 src/tracks.c  |  6 ++++--
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/include/mix.h b/include/mix.h
index c28a39c..e5da883 100644
--- a/include/mix.h
+++ b/include/mix.h
@@ -308,6 +308,7 @@ struct sl_remote {
 	struct call *call;
 	struct session *sess;
 };
+enum { SL_MAX_TRACKS = 16 };
 enum sl_track_type { SL_TRACK_REMOTE, SL_TRACK_REMOTE_RTC, SL_TRACK_LOCAL };
 enum sl_track_status {
 	SL_TRACK_INVALID	     = -1,
diff --git a/src/source.c b/src/source.c
index 9387a4e..bfcc7f5 100644
--- a/src/source.c
+++ b/src/source.c
@@ -156,34 +156,32 @@ static void source_dealloc(void *arg)
 
 static int32_t source_id_next(struct source_pc *src)
 {
-	int32_t next_id = 0;
-	if (!src || !src->sess)
-		return -1;
+	int32_t next_id;
+	for (next_id = 0; next_id <= SL_MAX_TRACKS; next_id++) {
+		struct sl_track *track = sl_track_by_id(next_id + 1);
+		if (!track) {
+			sl_track_add(&track, SL_TRACK_REMOTE_RTC);
+			track->status = SL_TRACK_REMOTE_CONNECTED;
+			info("track/source add %d/%d, RTC\n", track->id,
+			     next_id);
 
-	if (!src->sess->source_pcl.tail)
-		goto out;
+			goto out;
+		}
 
-	struct source_pc *last = src->sess->source_pcl.tail->data;
+		if (track->status == SL_TRACK_IDLE) {
+			track->type   = SL_TRACK_REMOTE_RTC;
+			track->status = SL_TRACK_REMOTE_CONNECTED;
+			info("track/source update %d/%d, RTC\n", track->id,
+			     next_id);
 
-	if (!last)
-		return -1;
+			goto out;
+		}
+	}
 
-	next_id = last->id + 1;
+	next_id = -1;
 
 out:
-	struct sl_track *track = sl_track_by_id(next_id + 1);
-	if (!track) {
-		info("track/source add %d/%d, RTC\n", track->id, next_id);
-		sl_track_add(&track, SL_TRACK_REMOTE_RTC);
-		track->status = SL_TRACK_REMOTE_CONNECTED;
-	}
-	else if (track->status == SL_TRACK_IDLE) {
-		info("track/source update %d/%d, RTC\n", track->id, next_id);
-		track->type   = SL_TRACK_REMOTE_RTC;
-		track->status = SL_TRACK_REMOTE_CONNECTED;
-	}
 	sl_track_ws_send();
-
 	return next_id;
 }
 
diff --git a/src/tracks.c b/src/tracks.c
index 61d8ffb..6ad9cf3 100644
--- a/src/tracks.c
+++ b/src/tracks.c
@@ -2,7 +2,6 @@
 #include <baresip.h>
 #include <mix.h>
 
-#define SL_MAX_TRACKS 16
 
 static struct list tracks = LIST_INIT;
 
@@ -275,9 +274,12 @@ void sl_track_hangup(struct sl_track *track)
 		ua_hangup(call_get_ua(track->u.remote.call),
 			  track->u.remote.call, 0, "");
 
-	if (track->type == SL_TRACK_REMOTE_RTC)
+	if (track->type == SL_TRACK_REMOTE_RTC) {
 		track->status = SL_TRACK_IDLE;
 
+		/*TODO quit rtc*/
+	}
+
 	track->name[0]	     = '\0';
 	track->u.remote.call = NULL;
 }

From 086e7e95fefa2f75ceecba4b7010552657377c7f Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Sun, 5 Apr 2026 10:46:39 +0200
Subject: [PATCH 20/26] wip: improve source_id track handling

---
 include/mix.h |  1 +
 src/source.c  | 20 ++++++++++++++------
 src/tracks.c  | 12 +++++++-----
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/include/mix.h b/include/mix.h
index e5da883..1a68a40 100644
--- a/include/mix.h
+++ b/include/mix.h
@@ -324,6 +324,7 @@ enum sl_track_status {
 struct sl_track {
 	struct le le;
 	uint16_t id;
+	int32_t source_id;
 	enum sl_track_type type;
 	char name[64];
 	char error[128];
diff --git a/src/source.c b/src/source.c
index bfcc7f5..3d9e24b 100644
--- a/src/source.c
+++ b/src/source.c
@@ -157,25 +157,33 @@ static void source_dealloc(void *arg)
 static int32_t source_id_next(struct source_pc *src)
 {
 	int32_t next_id;
-	for (next_id = 0; next_id <= SL_MAX_TRACKS; next_id++) {
+	for (next_id = 0; next_id < SL_MAX_TRACKS; next_id++) {
 		struct sl_track *track = sl_track_by_id(next_id + 1);
 		if (!track) {
 			sl_track_add(&track, SL_TRACK_REMOTE_RTC);
-			track->status = SL_TRACK_REMOTE_CONNECTED;
+			track->status	 = SL_TRACK_REMOTE_CONNECTED;
+			track->source_id = next_id;
 			info("track/source add %d/%d, RTC\n", track->id,
 			     next_id);
 
 			goto out;
 		}
-
-		if (track->status == SL_TRACK_IDLE) {
-			track->type   = SL_TRACK_REMOTE_RTC;
-			track->status = SL_TRACK_REMOTE_CONNECTED;
+		else if (track->source_id == -1 &&
+			 track->status == SL_TRACK_IDLE) {
+			track->type	 = SL_TRACK_REMOTE_RTC;
+			track->status	 = SL_TRACK_REMOTE_CONNECTED;
+			track->source_id = next_id;
 			info("track/source update %d/%d, RTC\n", track->id,
 			     next_id);
 
 			goto out;
 		}
+		else if (track->source_id == -1) {
+			track->source_id = next_id;
+			info("track/source update %d/%d\n", track->id,
+			     next_id);
+			goto out;
+		}
 	}
 
 	next_id = -1;
diff --git a/src/tracks.c b/src/tracks.c
index 6ad9cf3..81a3181 100644
--- a/src/tracks.c
+++ b/src/tracks.c
@@ -128,10 +128,11 @@ int sl_track_add(struct sl_track **trackp, enum sl_track_type type)
 	if (!track)
 		return ENOMEM;
 
-	track->id     = sl_track_next_id();
-	track->type   = type;
-	track->status = SL_TRACK_IDLE;
-	track->muted  = false;
+	track->id	 = sl_track_next_id();
+	track->source_id = -1;
+	track->type	 = type;
+	track->status	 = SL_TRACK_IDLE;
+	track->muted	 = false;
 
 	list_append(&tracks, &track->le, track);
 	list_sort(&tracks, sort_handler, NULL);
@@ -276,10 +277,10 @@ void sl_track_hangup(struct sl_track *track)
 
 	if (track->type == SL_TRACK_REMOTE_RTC) {
 		track->status = SL_TRACK_IDLE;
-
 		/*TODO quit rtc*/
 	}
 
+	track->source_id     = -1;
 	track->name[0]	     = '\0';
 	track->u.remote.call = NULL;
 }
@@ -452,6 +453,7 @@ static void eventh(enum bevent_ev ev, struct bevent *event, void *arg)
 			track->status	     = SL_TRACK_IDLE;
 			track->u.remote.call = NULL;
 			track->name[0]	     = '\0';
+			track->source_id     = -1;
 			if (call_scode(call) != 200)
 				str_ncpy(track->error, prm,
 					 sizeof(track->error));

From 06f8ef9d2048ecc6d413a70c3ac8a4fbae1572e0 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Sun, 5 Apr 2026 11:19:00 +0200
Subject: [PATCH 21/26] wip: cleanup

---
 include/mix.h |  1 -
 src/source.c  | 16 +---------------
 src/tracks.c  |  3 ---
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/include/mix.h b/include/mix.h
index 1a68a40..e5da883 100644
--- a/include/mix.h
+++ b/include/mix.h
@@ -324,7 +324,6 @@ enum sl_track_status {
 struct sl_track {
 	struct le le;
 	uint16_t id;
-	int32_t source_id;
 	enum sl_track_type type;
 	char name[64];
 	char error[128];
diff --git a/src/source.c b/src/source.c
index 3d9e24b..f1191bf 100644
--- a/src/source.c
+++ b/src/source.c
@@ -162,28 +162,14 @@ static int32_t source_id_next(struct source_pc *src)
 		if (!track) {
 			sl_track_add(&track, SL_TRACK_REMOTE_RTC);
 			track->status	 = SL_TRACK_REMOTE_CONNECTED;
-			track->source_id = next_id;
 			info("track/source add %d/%d, RTC\n", track->id,
 			     next_id);
 
 			goto out;
 		}
-		else if (track->source_id == -1 &&
-			 track->status == SL_TRACK_IDLE) {
-			track->type	 = SL_TRACK_REMOTE_RTC;
-			track->status	 = SL_TRACK_REMOTE_CONNECTED;
-			track->source_id = next_id;
-			info("track/source update %d/%d, RTC\n", track->id,
-			     next_id);
 
+		if (str_cmp(track->name, src->dev) == 0)
 			goto out;
-		}
-		else if (track->source_id == -1) {
-			track->source_id = next_id;
-			info("track/source update %d/%d\n", track->id,
-			     next_id);
-			goto out;
-		}
 	}
 
 	next_id = -1;
diff --git a/src/tracks.c b/src/tracks.c
index 81a3181..245025f 100644
--- a/src/tracks.c
+++ b/src/tracks.c
@@ -129,7 +129,6 @@ int sl_track_add(struct sl_track **trackp, enum sl_track_type type)
 		return ENOMEM;
 
 	track->id	 = sl_track_next_id();
-	track->source_id = -1;
 	track->type	 = type;
 	track->status	 = SL_TRACK_IDLE;
 	track->muted	 = false;
@@ -280,7 +279,6 @@ void sl_track_hangup(struct sl_track *track)
 		/*TODO quit rtc*/
 	}
 
-	track->source_id     = -1;
 	track->name[0]	     = '\0';
 	track->u.remote.call = NULL;
 }
@@ -453,7 +451,6 @@ static void eventh(enum bevent_ev ev, struct bevent *event, void *arg)
 			track->status	     = SL_TRACK_IDLE;
 			track->u.remote.call = NULL;
 			track->name[0]	     = '\0';
-			track->source_id     = -1;
 			if (call_scode(call) != 200)
 				str_ncpy(track->error, prm,
 					 sizeof(track->error));

From 0cde649bc0ed7dc00d5f9a2b5b54a5b8175ba823 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Sun, 5 Apr 2026 13:29:07 +0200
Subject: [PATCH 22/26] wip: add track focus handling

---
 include/mix.h                               |  2 ++
 src/http.c                                  | 23 +++++++++++++++
 src/source.c                                |  4 ++-
 src/tracks.c                                | 31 ++++++++++++++++++---
 webui/src/api.ts                            |  6 +++-
 webui/src/components/Tracks/RemoteTrack.vue |  6 +++-
 webui/src/shortcuts.ts                      | 26 ++++++-----------
 webui/src/ws/tracks.ts                      | 12 ++++++--
 8 files changed, 83 insertions(+), 27 deletions(-)

diff --git a/include/mix.h b/include/mix.h
index e5da883..5179e39 100644
--- a/include/mix.h
+++ b/include/mix.h
@@ -329,6 +329,7 @@ struct sl_track {
 	char error[128];
 	enum sl_track_status status;
 	bool muted;
+	bool focus;
 	union
 	{
 		struct sl_local local;
@@ -341,6 +342,7 @@ const struct list *sl_tracks(void);
 int sl_track_next_id(void);
 int sl_track_add(struct sl_track **trackp, enum sl_track_type type);
 int sl_track_del(int id);
+void sl_track_focus(int id);
 enum sl_track_status sl_track_status(int id);
 int sl_tracks_json(struct re_printf *pf, void *arg);
 struct sl_track *sl_track_by_id(int id);
diff --git a/src/http.c b/src/http.c
index 498098f..f34dedd 100644
--- a/src/http.c
+++ b/src/http.c
@@ -258,6 +258,27 @@ static void http_req_handler(struct http_conn *conn,
 		return;
 	}
 
+
+	ROUTE("/api/v1/tracks/focus", "POST")
+	{
+		if (!sess->user->host)
+			goto auth;
+
+		struct pl pltrack = PL_INIT;
+		err = re_regex((char *)mbuf_buf(msg->mb),
+			       mbuf_get_left(msg->mb), "[0-9]+", &pltrack);
+		if (err)
+			goto err;
+
+		int32_t id = pl_i32(&pltrack);
+
+		sl_track_focus(id);
+
+		http_sreply(conn, 204, "OK", "text/html", "", 0, sess);
+		return;
+	}
+
+
 	ROUTE("/api/v1/tracks", "DELETE")
 	{
 		if (!sess->user->host)
@@ -266,6 +287,8 @@ static void http_req_handler(struct http_conn *conn,
 		struct pl pltrack = PL_INIT;
 		err = re_regex((char *)mbuf_buf(msg->mb),
 			       mbuf_get_left(msg->mb), "[0-9]+", &pltrack);
+		if (err)
+			goto err;
 		int32_t id = pl_i32(&pltrack);
 
 		err = sl_track_del(id);
diff --git a/src/source.c b/src/source.c
index f1191bf..8192c97 100644
--- a/src/source.c
+++ b/src/source.c
@@ -161,7 +161,9 @@ static int32_t source_id_next(struct source_pc *src)
 		struct sl_track *track = sl_track_by_id(next_id + 1);
 		if (!track) {
 			sl_track_add(&track, SL_TRACK_REMOTE_RTC);
-			track->status	 = SL_TRACK_REMOTE_CONNECTED;
+			track->status = SL_TRACK_REMOTE_CONNECTED;
+			re_snprintf(track->name, sizeof(track->name), "%s",
+				    src->dev);
 			info("track/source add %d/%d, RTC\n", track->id,
 			     next_id);
 
diff --git a/src/tracks.c b/src/tracks.c
index 245025f..6ef567d 100644
--- a/src/tracks.c
+++ b/src/tracks.c
@@ -51,6 +51,7 @@ int sl_tracks_json(struct re_printf *pf, void *arg)
 		odict_entry_add(o_track, "status", ODICT_INT, track->status);
 		odict_entry_add(o_track, "error", ODICT_STRING, track->error);
 		odict_entry_add(o_track, "muted", ODICT_BOOL, track->muted);
+		odict_entry_add(o_track, "focus", ODICT_BOOL, track->focus);
 		odict_entry_add(o_tracks, str_itoa(track->id, id, 10),
 				ODICT_OBJECT, o_track);
 		o_track = mem_deref(o_track);
@@ -128,10 +129,10 @@ int sl_track_add(struct sl_track **trackp, enum sl_track_type type)
 	if (!track)
 		return ENOMEM;
 
-	track->id	 = sl_track_next_id();
-	track->type	 = type;
-	track->status	 = SL_TRACK_IDLE;
-	track->muted	 = false;
+	track->id     = sl_track_next_id();
+	track->type   = type;
+	track->status = SL_TRACK_IDLE;
+	track->muted  = false;
 
 	list_append(&tracks, &track->le, track);
 	list_sort(&tracks, sort_handler, NULL);
@@ -142,6 +143,28 @@ int sl_track_add(struct sl_track **trackp, enum sl_track_type type)
 }
 
 
+void sl_track_focus(int id)
+{
+	struct le *le;
+	struct mix *mix = slmix();
+
+	LIST_FOREACH(&tracks, le)
+	{
+		struct sl_track *track = le->data;
+
+		track->focus = false;
+		slmix_disp_enable(mix, track->name, false);
+
+		if (track->id == id) {
+			slmix_disp_enable(mix, track->name, true);
+			track->focus = true;
+		}
+	}
+
+	sl_track_ws_send();
+}
+
+
 int sl_track_del(int id)
 {
 	struct le *le;
diff --git a/webui/src/api.ts b/webui/src/api.ts
index 44c668d..0e536a8 100644
--- a/webui/src/api.ts
+++ b/webui/src/api.ts
@@ -213,7 +213,11 @@ export default {
     },
 
     async track_del(track: number) {
-        api_fetch('DELETE', '/tracks', String(track))
+        api_fetch('DELETE', '/tracks', String(track), false)
+    },
+
+    async track_focus(track: number) {
+        api_fetch('POST', '/tracks/focus', String(track), false)
     },
 
     async track_accept(track: number) {
diff --git a/webui/src/components/Tracks/RemoteTrack.vue b/webui/src/components/Tracks/RemoteTrack.vue
index 5835333..f70a121 100644
--- a/webui/src/components/Tracks/RemoteTrack.vue
+++ b/webui/src/components/Tracks/RemoteTrack.vue
@@ -12,7 +12,7 @@
             <!-- <div class="font-semibold text-sm text-sl-red uppercase">Error</div> -->
         </div>
 
-        <div class="flex mt-1">
+        <div class="flex mt-1 border-red-500" :class="[isFocused() ? 'border-red-700 border-2' : '']">
             <div class="relative bg-sl-02dpa rounded-lg min-h-[12em] w-full shadow-sm pb-2">
                 <div class="flex justify-between items-center">
                     <div :id="`track${pkey}`" ref="tid" tabindex="0" @focus="setActive()"
@@ -72,6 +72,10 @@ function isActive() {
     return Tracks.isSelected(props.pkey)
 }
 
+function isFocused() {
+    return Tracks.isFocused(props.pkey)
+}
+
 function setActive() {
     Tracks.select(props.pkey)
 }
diff --git a/webui/src/shortcuts.ts b/webui/src/shortcuts.ts
index ced8a45..77f6c7c 100644
--- a/webui/src/shortcuts.ts
+++ b/webui/src/shortcuts.ts
@@ -1,14 +1,4 @@
 import api from './api'
-import { State } from './ws/state'
-
-function solo_source(index: number) {
-    const dev = State.sources.value[index].dev
-    api.video_solo(dev, true)
-    State.sources.value.forEach((item) => {
-        if (dev === item.dev) item.solo = true
-        else item.solo = false
-    })
-}
 
 document.onkeydown = (event) => {
     if (document.activeElement?.tagName === 'INPUT')
@@ -19,28 +9,28 @@ document.onkeydown = (event) => {
 
     switch (event.code) {
         case "Digit1":
-            solo_source(0)
+            api.track_focus(1)
             break
         case "Digit2":
-            solo_source(1)
+            api.track_focus(2)
             break
         case "Digit3":
-            solo_source(2)
+            api.track_focus(3)
             break
         case "Digit4":
-            solo_source(3)
+            api.track_focus(4)
             break
         case "Digit5":
-            solo_source(4)
+            api.track_focus(5)
             break
         case "Digit6":
-            solo_source(5)
+            api.track_focus(6)
             break
         case "Digit7":
-            solo_source(6)
+            api.track_focus(7)
             break
         case "Digit8":
-            solo_source(7)
+            api.track_focus(8)
             break
     }
 }
diff --git a/webui/src/ws/tracks.ts b/webui/src/ws/tracks.ts
index e53d476..fa0cbf4 100644
--- a/webui/src/ws/tracks.ts
+++ b/webui/src/ws/tracks.ts
@@ -23,6 +23,7 @@ interface Track {
     name: string
     status: TrackStatus
     muted: boolean
+    focus: boolean
     error: string
 }
 
@@ -59,6 +60,7 @@ interface Tracks {
     getTrackName(id: number): string
     websocket(): void
     isValid(id: number): boolean
+    isFocused(id: number): boolean
     isSelected(id: number): boolean
     isMuted(id: number): boolean
     localState(id: number): LocalTrackStates
@@ -112,7 +114,8 @@ export const Tracks: Tracks = {
                     error: "",
                     local: LocalTrackStates.Setup,
                     name: tracks[key].name,
-                    muted: tracks[key].muted
+                    muted: tracks[key].muted,
+                    focus: tracks[key].focus
                 }
                 last_key = parseInt(key)
             }
@@ -120,6 +123,7 @@ export const Tracks: Tracks = {
             this.state[tracks[key].id].name = tracks[key].name
             this.state[tracks[key].id].status = tracks[key].status
             this.state[tracks[key].id].muted = tracks[key].muted
+            this.state[tracks[key].id].focus = tracks[key].focus
 
             if (tracks[key].type == 'local') {
                 this.local_tracks.push(tracks[key])
@@ -157,12 +161,16 @@ export const Tracks: Tracks = {
         return false
     },
 
+    isFocused(id: number): boolean {
+        return this.state[id]?.focus
+    },
+
     isMuted(id: number): boolean {
         return this.state[id]?.muted
     },
 
     localState(id: number): LocalTrackStates {
-        return this.state[id].local
+        return this.state[id]?.local
     },
 
     select(id: number): void {

From 12ca6a0b1deb6154fa289aeec4e875ff9bbd6320 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Sun, 5 Apr 2026 14:33:38 +0200
Subject: [PATCH 23/26] wip: add track mute

---
 include/mix.h                               |  2 +-
 src/http.c                                  | 19 +++++++++++++++++++
 src/tracks.c                                | 16 ++++++++++------
 webui/src/api.ts                            |  4 ++++
 webui/src/components/Tracks/RemoteTrack.vue | 21 ++++++++++++++++-----
 5 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/include/mix.h b/include/mix.h
index 5179e39..8ec783a 100644
--- a/include/mix.h
+++ b/include/mix.h
@@ -350,5 +350,5 @@ struct slaudio *sl_track_audio(struct sl_track *track);
 int sl_track_dial(struct sl_track *track, struct pl *peer);
 void sl_track_accept(struct sl_track *track);
 void sl_track_hangup(struct sl_track *track);
-void sl_track_toggle_mute(struct sl_track *track);
+void sl_track_toggle_mute(int id);
 void sl_track_ws_send(void);
diff --git a/src/http.c b/src/http.c
index f34dedd..db70ddf 100644
--- a/src/http.c
+++ b/src/http.c
@@ -258,6 +258,25 @@ static void http_req_handler(struct http_conn *conn,
 		return;
 	}
 
+	ROUTE("/api/v1/tracks/togglemute", "POST")
+	{
+		if (!sess->user->host)
+			goto auth;
+
+		struct pl pltrack = PL_INIT;
+		err = re_regex((char *)mbuf_buf(msg->mb),
+			       mbuf_get_left(msg->mb), "[0-9]+", &pltrack);
+		if (err)
+			goto err;
+
+		int32_t id = pl_i32(&pltrack);
+
+		sl_track_toggle_mute(id);
+
+		http_sreply(conn, 204, "OK", "text/html", "", 0, sess);
+		return;
+	}
+
 
 	ROUTE("/api/v1/tracks/focus", "POST")
 	{
diff --git a/src/tracks.c b/src/tracks.c
index 6ef567d..0dd5a51 100644
--- a/src/tracks.c
+++ b/src/tracks.c
@@ -132,7 +132,7 @@ int sl_track_add(struct sl_track **trackp, enum sl_track_type type)
 	track->id     = sl_track_next_id();
 	track->type   = type;
 	track->status = SL_TRACK_IDLE;
-	track->muted  = false;
+	track->muted  = true;
 
 	list_append(&tracks, &track->le, track);
 	list_sort(&tracks, sort_handler, NULL);
@@ -307,13 +307,16 @@ void sl_track_hangup(struct sl_track *track)
 }
 
 
-void sl_track_toggle_mute(struct sl_track *track)
+void sl_track_toggle_mute(int id)
 {
-	/* only allowed for local track currently */
-	if (!track || track->id != 1)
+	struct sl_track *track = sl_track_by_id(id);
+	if (!track)
 		return;
 
-	local_track->muted = !local_track->muted;
+	track->muted = !track->muted;
+
+	amix_mute(track->name, track->muted, 0);
+
 	sl_track_ws_send();
 }
 
@@ -456,7 +459,8 @@ static void eventh(enum bevent_ev ev, struct bevent *event, void *arg)
 
 			slmix_source_append_all(mix, call, peername);
 
-			amix_mute(peername, false, ++mix->next_speaker_id);
+			amix_mute(peername, track->muted,
+				  ++mix->next_speaker_id);
 			track->u.remote.sess->call	  = call;
 			track->u.remote.sess->connected	  = true;
 			track->u.remote.sess->user->video = true;
diff --git a/webui/src/api.ts b/webui/src/api.ts
index 0e536a8..01a3284 100644
--- a/webui/src/api.ts
+++ b/webui/src/api.ts
@@ -212,6 +212,10 @@ export default {
         api_fetch('POST', '/tracks/' + type, null);
     },
 
+    async track_togglemute(track: number) {
+        api_fetch('POST', '/tracks/togglemute', String(track), false)
+    },
+
     async track_del(track: number) {
         api_fetch('DELETE', '/tracks', String(track), false)
     },
diff --git a/webui/src/components/Tracks/RemoteTrack.vue b/webui/src/components/Tracks/RemoteTrack.vue
index f70a121..acb9d5d 100644
--- a/webui/src/components/Tracks/RemoteTrack.vue
+++ b/webui/src/components/Tracks/RemoteTrack.vue
@@ -1,5 +1,6 @@
 <template>
-    <li aria-label="Remote track" class="aspect-video col-span-1" @mouseenter="setActive()" @touchstart.passive="setActive()">
+    <li aria-label="Remote track" class="aspect-video col-span-1" @mouseenter="setActive()"
+        @touchstart.passive="setActive()">
         <div class="flex justify-between h-5">
             <h2 class="ml-1 font-semibold text-sl-disabled text-sm truncate pr-2">{{ getTrackName() }}</h2>
             <div class="flex">
@@ -22,6 +23,8 @@
                         {{ pkey }}
                         <span class="sr-only">selected</span>
                     </div>
+                    <button @click="toggleMuteRemote()" :class="[isMuted() ? 'bg-red-900' : 'bg-sl-disabled']"
+                        class="rounded-sm px-2 py-1 text-xs font-semibold text-sl  shadow-xs hover:bg-indigo-100 dark:bg-indigo-500/20 dark:text-indigo-400 dark:shadow-none dark:hover:bg-indigo-500/30">M</button>
                     <div class="shrink-0 pr-2 text-right mt-2 w-8 h-8">
                         <RemoteTrackSettings v-if="isActive()" :pkey="props.pkey" />
                     </div>
@@ -39,10 +42,10 @@
                 </div>
             </div>
 
-            <div class="flex w-5 items-end ml-0.5 opacity-60" aria-hidden="true">
+            <div v-if=0 class="flex w-5 items-end ml-0.5 opacity-60" aria-hidden="true">
                 <div id="levels" class="levels">
-                    <div :id="'level'+(pkey+pkey-1)" class="level"></div>
-                    <div :id="'level'+(pkey+pkey)" class="level"></div>
+                    <div :id="'level' + (pkey + pkey - 1)" class="level"></div>
+                    <div :id="'level' + (pkey + pkey)" class="level"></div>
                 </div>
             </div>
         </div>
@@ -56,7 +59,7 @@ import RemoteTrackCall from './RemoteTrackCall.vue'
 import { Tracks } from '../../ws/tracks'
 import api from '../../api'
 
-const props = defineProps({ 
+const props = defineProps({
     'pkey': { type: Number, required: true },
     'idx': { type: Number, required: true },
     'error': { type: String, required: true },
@@ -72,6 +75,10 @@ function isActive() {
     return Tracks.isSelected(props.pkey)
 }
 
+function isMuted() {
+    return Tracks.isMuted(props.pkey)
+}
+
 function isFocused() {
     return Tracks.isFocused(props.pkey)
 }
@@ -87,4 +94,8 @@ function getTrackName() {
 function deleteRemoteTrack() {
     api.track_del(props.pkey)
 }
+
+function toggleMuteRemote() {
+    api.track_togglemute(props.pkey)
+}
 </script>

From 9b779248e1a7c603cfeac49e39cba1a2f66bcc30 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Sun, 5 Apr 2026 14:50:22 +0200
Subject: [PATCH 24/26] wip: ui fixes

---
 webui/index.html                       | 4 ++--
 webui/src/components/BottomActions.vue | 1 +
 webui/src/components/WebrtcVideo.vue   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/webui/index.html b/webui/index.html
index 66cb364..560d1ca 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="h-full bg-gray-50" lang="en">
+<html class="h-full" style="background-color: #0f0f0f" lang="en">
 
 <head>
     <meta charset="UTF-8" />
@@ -10,7 +10,7 @@
     <base target="_blank">
 </head>
 
-<body class="h-full" style="background-color: #0f0f0f">
+<body class="h-full">
     <div id="app"></div>
     <script type="module" src="/src/main.ts"></script>
 </body>
diff --git a/webui/src/components/BottomActions.vue b/webui/src/components/BottomActions.vue
index 521aab7..0d04fe0 100644
--- a/webui/src/components/BottomActions.vue
+++ b/webui/src/components/BottomActions.vue
@@ -1,5 +1,6 @@
 <template>
   <div
+    v-if="!State.user.value.host"
     class="fixed inset-x-0 bottom-0 z-20"
     :class="[Webrtc.state.value >= WebrtcState.Listening ? '' : 'bg-gray-500']"
   >
diff --git a/webui/src/components/WebrtcVideo.vue b/webui/src/components/WebrtcVideo.vue
index b680fa7..6b15b8f 100644
--- a/webui/src/components/WebrtcVideo.vue
+++ b/webui/src/components/WebrtcVideo.vue
@@ -23,7 +23,7 @@
       @mouseleave="nav = false"
       @touchstart.passive="nav = true"
       class="relative flex bg-black mx-auto"
-      :class="[isFullscreen ? 'w-full' : 'max-w-(--breakpoint-xl) mt-8 lg:mt-0']"
+      :class="[isFullscreen ? 'w-full' : 'max-w-(--breakpoint-lg) mt-8 lg:mt-0']"
     >
       <div v-show="nav" class="absolute z-30 text-gray-200 bottom-0 right-0 px-2">
         <button class="mr-4" @click="enable_stats()" type="button">

From d51cb15da34d0c2aa01d679a98af8501a37dab82 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Sun, 5 Apr 2026 14:50:33 +0200
Subject: [PATCH 25/26] wip/track: always deref sess

---
 src/tracks.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/tracks.c b/src/tracks.c
index 0dd5a51..0175854 100644
--- a/src/tracks.c
+++ b/src/tracks.c
@@ -108,6 +108,8 @@ static void track_destructor(void *data)
 		if (track->u.remote.call)
 			ua_hangup(slmix_sip_ua(), track->u.remote.call, 0,
 				  NULL);
+
+		track->u.remote.sess = mem_deref(track->u.remote.sess);
 	}
 }
 
@@ -293,9 +295,11 @@ void sl_track_hangup(struct sl_track *track)
 
 	warning("hangup %d\n", track->type);
 
-	if (track->type == SL_TRACK_REMOTE)
+	if (track->type == SL_TRACK_REMOTE) {
+		track->u.remote.sess = mem_deref(track->u.remote.sess);
 		ua_hangup(call_get_ua(track->u.remote.call),
 			  track->u.remote.call, 0, "");
+	}
 
 	if (track->type == SL_TRACK_REMOTE_RTC) {
 		track->status = SL_TRACK_IDLE;

From f7ad9c44c576814819de0a789a87c3395ec0c9b5 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Tue, 7 Apr 2026 17:00:12 +0200
Subject: [PATCH 26/26] track: fix hangup rtc session (downgrade listener)

---
 src/tracks.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/tracks.c b/src/tracks.c
index 0175854..0cf603d 100644
--- a/src/tracks.c
+++ b/src/tracks.c
@@ -302,10 +302,20 @@ void sl_track_hangup(struct sl_track *track)
 	}
 
 	if (track->type == SL_TRACK_REMOTE_RTC) {
-		track->status = SL_TRACK_IDLE;
-		/*TODO quit rtc*/
+		track->status	  = SL_TRACK_IDLE;
+		struct mix *mix	  = slmix();
+		struct pl user_id = PL_INIT;
+
+		pl_set_str(&user_id, track->name);
+		struct session *sess =
+			slmix_session_lookup_user_id(&mix->sessl, &user_id);
+		if (!sess)
+			goto out;
+
+		slmix_session_speaker(sess, false);
 	}
 
+out:
 	track->name[0]	     = '\0';
 	track->u.remote.call = NULL;
 }