3 files changed, 32 insertions, 15 deletions
diff --git a/extras/HOME/.local/bin/media-control b/extras/HOME/.local/bin/media-control
index 04acad4..5ea0e8e 100755
--- a/extras/HOME/.local/bin/media-control
+++ b/extras/HOME/.local/bin/media-control
@@ -41,6 +41,11 @@ if [[ $target == *@charm ]]; then
   target=${target%@charm}
 fi
 
+if [[ $target == *@boson ]]; then
+  remote_host=boson
+  target=${target%@boson}
+fi
+
 dbus_send() {
   if [[ -z $remote_host ]]; then
     command dbus-send "$@"
diff --git a/extras/HOME/.local/bin/media-select.sh b/extras/HOME/.local/bin/media-select.sh
index 71b9487..bbfda5d 100755
--- a/extras/HOME/.local/bin/media-select.sh
+++ b/extras/HOME/.local/bin/media-select.sh
@@ -18,13 +18,17 @@ local_players=$(
 
 remote_players=
 if pgrep -u "$(id -u)" -f 'deskflow-core[[:space:]]+server([[:space:]]|$)' >/dev/null; then
-  remote_players=$(
-    ssh -T -o BatchMode=yes -o ConnectTimeout=2 charm \
-      'DBUS_SESSION_BUS_ADDRESS="$(cat /var/run/user/1000/rde/dbus-address)" dbus-send --session --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.ListNames' \
-      2>/dev/null |
-      list_players |
-      sed 's/$/@charm/'
-  )
+  remote_players=""
+  for remote in charm boson ; do
+    remote_players="$remote_players
+$(
+      ssh -T -o BatchMode=yes -o ConnectTimeout=2 "$remote" \
+        'DBUS_SESSION_BUS_ADDRESS="$(cat /var/run/user/1000/rde/dbus-address)" dbus-send --session --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.ListNames' \
+        2>/dev/null |
+        list_players |
+        sed 's/$/@'"$remote"'/'
+      )"
+  done
 fi
 
 selection=$(
diff --git a/extras/HOME/.local/bin/pactl-proxy.sh b/extras/HOME/.local/bin/pactl-proxy.sh
index 0584955..9ef75c5 100755
--- a/extras/HOME/.local/bin/pactl-proxy.sh
+++ b/extras/HOME/.local/bin/pactl-proxy.sh
@@ -1,11 +1,19 @@
 #!/bin/bash
 
-media_selection_file="${XDG_RUNTIME_DIR:?}/rde/vars/MEDIA"
-target=$(< "$media_selection_file")
+pactl "$@"
 
-if [[ $target == *@charm ]] ; then
-  printf -v remote_command '%q ' pactl "$@"
-  ssh -T -o BatchMode=yes -o ConnectTimeout=2 charm "$remote_command"
-else
-  pactl "$@"
-fi
+# # Actually this is probably not needed because I can just forward audio
+# directly to boson.
+#
+# media_selection_file="${XDG_RUNTIME_DIR:?}/rde/vars/MEDIA"
+# target=$(< "$media_selection_file")
+# 
+# if [[ $target == *@charm ]] ; then
+#   printf -v remote_command '%q ' pactl "$@"
+#   ssh -T -o BatchMode=yes -o ConnectTimeout=2 charm "$remote_command"
+# if [[ $target == *@boson ]] ; then
+#   printf -v remote_command '%q ' pactl "$@"
+#   ssh -T -o BatchMode=yes -o ConnectTimeout=2 boson "$remote_command"
+# else
+#   pactl "$@"
+# fi