From 02b5b6fe1f9f919f0cafea3efc6be2403a3f7139 Mon Sep 17 00:00:00 2001
From: Cameron Clough <cameronjclough@gmail.com>
Date: Wed, 30 Nov 2022 15:36:25 -0800
Subject: [PATCH] soundd: change system sound mixer volume (#26633)

* test changing sound volume

* create system/hardware/pc/hardware.h

* soundd: use Hardware::set_volume

* implement Hardware::set_volume using pactl

* Revert "test changing sound volume"

This reverts commit 4bbd870746ec86d1c9871a6175def96cf7f751a6.

* don't run command in background

* pactl: use default sink
---
 release/files_common            |  1 +
 selfdrive/ui/soundd/sound.cc    |  8 ++------
 system/hardware/base.h          |  1 +
 system/hardware/hw.h            | 10 +---------
 system/hardware/pc/hardware.h   | 21 +++++++++++++++++++++
 system/hardware/tici/hardware.h |  7 +++++++
 6 files changed, 33 insertions(+), 15 deletions(-)
 create mode 100644 system/hardware/pc/hardware.h

diff --git a/release/files_common b/release/files_common
index a294e1e5b5..2400c3c0dc 100644
--- a/release/files_common
+++ b/release/files_common
@@ -216,6 +216,7 @@ system/hardware/tici/amplifier.py
 system/hardware/tici/updater
 system/hardware/tici/iwlist.py
 system/hardware/pc/__init__.py
+system/hardware/pc/hardware.h
 system/hardware/pc/hardware.py
 
 selfdrive/locationd/__init__.py
diff --git a/selfdrive/ui/soundd/sound.cc b/selfdrive/ui/soundd/sound.cc
index 6830450d8f..841bea3b8b 100644
--- a/selfdrive/ui/soundd/sound.cc
+++ b/selfdrive/ui/soundd/sound.cc
@@ -20,7 +20,6 @@ Sound::Sound(QObject *parent) : sm({"carState", "controlsState", "deviceState"})
     QObject::connect(s, &QSoundEffect::statusChanged, [=]() {
       assert(s->status() != QSoundEffect::Error);
     });
-    s->setVolume(Hardware::MIN_VOLUME);
     s->setSource(QUrl::fromLocalFile("../../assets/sounds/" + fn));
     sounds[alert] = {s, loops};
   }
@@ -49,12 +48,9 @@ void Sound::update() {
 
   // scale volume with speed
   if (sm.updated("carState")) {
-    float volume = util::map_val(sm["carState"].getCarState().getVEgo(), 11.f, 20.f, 0.f, 1.0f);
+    float volume = util::map_val(sm["carState"].getCarState().getVEgo(), 11.f, 20.f, 0.f, 1.f);
     volume = QAudio::convertVolume(volume, QAudio::LogarithmicVolumeScale, QAudio::LinearVolumeScale);
-    volume = util::map_val(volume, 0.f, 1.f, Hardware::MIN_VOLUME, Hardware::MAX_VOLUME);
-    for (auto &[s, loops] : sounds) {
-      s->setVolume(std::round(100 * volume) / 100);
-    }
+    Hardware::set_volume(volume);
   }
 
   setAlert(Alert::get(sm, started_frame));
diff --git a/system/hardware/base.h b/system/hardware/base.h
index b70948d482..f6e0b42d73 100644
--- a/system/hardware/base.h
+++ b/system/hardware/base.h
@@ -20,6 +20,7 @@ public:
   static void poweroff() {}
   static void set_brightness(int percent) {}
   static void set_display_power(bool on) {}
+  static void set_volume(float volume) {}
 
   static bool get_ssh_enabled() { return false; }
   static void set_ssh_enabled(bool enabled) {}
diff --git a/system/hardware/hw.h b/system/hardware/hw.h
index f50e94abe1..5599e79186 100644
--- a/system/hardware/hw.h
+++ b/system/hardware/hw.h
@@ -7,15 +7,7 @@
 #include "system/hardware/tici/hardware.h"
 #define Hardware HardwareTici
 #else
-class HardwarePC : public HardwareNone {
-public:
-  static std::string get_os_version() { return "openpilot for PC"; }
-  static std::string get_name() { return "pc"; };
-  static cereal::InitData::DeviceType get_device_type() { return cereal::InitData::DeviceType::PC; };
-  static bool PC() { return true; }
-  static bool TICI() { return util::getenv("TICI", 0) == 1; }
-  static bool AGNOS() { return util::getenv("TICI", 0) == 1; }
-};
+#include "system/hardware/pc/hardware.h"
 #define Hardware HardwarePC
 #endif
 
diff --git a/system/hardware/pc/hardware.h b/system/hardware/pc/hardware.h
new file mode 100644
index 0000000000..529b4bfe9d
--- /dev/null
+++ b/system/hardware/pc/hardware.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "system/hardware/base.h"
+
+class HardwarePC : public HardwareNone {
+public:
+  static std::string get_os_version() { return "openpilot for PC"; }
+  static std::string get_name() { return "pc"; };
+  static cereal::InitData::DeviceType get_device_type() { return cereal::InitData::DeviceType::PC; };
+  static bool PC() { return true; }
+  static bool TICI() { return util::getenv("TICI", 0) == 1; }
+  static bool AGNOS() { return util::getenv("TICI", 0) == 1; }
+
+  static void set_volume(float volume) {
+    volume = util::map_val(volume, 0.f, 1.f, MIN_VOLUME, MAX_VOLUME);
+
+    char volume_str[6];
+    snprintf(volume_str, sizeof(volume_str), "%.3f", volume);
+    std::system(("pactl set-sink-volume @DEFAULT_SINK@ " + std::string(volume_str)).c_str());
+  }
+};
diff --git a/system/hardware/tici/hardware.h b/system/hardware/tici/hardware.h
index dcccb9f3d1..02becb76e4 100644
--- a/system/hardware/tici/hardware.h
+++ b/system/hardware/tici/hardware.h
@@ -38,6 +38,13 @@ public:
       bl_power_control.close();
     }
   };
+  static void set_volume(float volume) {
+    volume = util::map_val(volume, 0.f, 1.f, MIN_VOLUME, MAX_VOLUME);
+
+    char volume_str[6];
+    snprintf(volume_str, sizeof(volume_str), "%.3f", volume);
+    std::system(("pactl set-sink-volume @DEFAULT_SINK@ " + std::string(volume_str)).c_str());
+  }
 
   static bool get_ssh_enabled() { return Params().getBool("SshEnabled"); };
   static void set_ssh_enabled(bool enabled) { Params().putBool("SshEnabled", enabled); };