soundd: fix path to sound files (#21801)

* fix assert on EON

* use qmap to make it a bit cleaner

selfdrive/ui/soundd.cc

@@ -18,7 +18,7 @@ class Sound : public QObject {
 public:
   explicit Sound(QObject *parent = 0) {
     // TODO: merge again and add EQ in the amp config
-    const QString sound_asset_path = Hardware::TICI ? "../assets/sounds_tici/" : "../assets/sounds/";
+    const QString sound_asset_path = Hardware::TICI() ? "../assets/sounds_tici/" : "../assets/sounds/";
     std::tuple<AudibleAlert, QString, bool> sound_list[] = {
       {AudibleAlert::CHIME_DISENGAGE, sound_asset_path + "disengaged.wav", false},
       {AudibleAlert::CHIME_ENGAGE, sound_asset_path + "engaged.wav", false},
@@ -30,9 +30,10 @@ public:
       {AudibleAlert::CHIME_PROMPT, sound_asset_path + "error.wav", false}
     };
     for (auto &[alert, fn, loops] : sound_list) {
-      sounds[alert].first.setSource(QUrl::fromLocalFile(fn));
+      QSoundEffect *s = new QSoundEffect(this);
-      sounds[alert].second = loops ? QSoundEffect::Infinite : 0;
+      QObject::connect(s, &QSoundEffect::statusChanged, this, &Sound::checkStatus);
-      QObject::connect(&sounds[alert].first, &QSoundEffect::statusChanged, this, &Sound::checkStatus);
+      s->setSource(QUrl::fromLocalFile(fn));
+      sounds[alert] = {s, loops ? QSoundEffect::Infinite : 0};
     }
 
     sm = new SubMaster({"carState", "controlsState"});
@@ -47,9 +48,8 @@ public:
 
 private slots:
   void checkStatus() {
-    for (auto &[alert, kv] : sounds) {
+    QSoundEffect *s = qobject_cast<QSoundEffect*>(sender());
-      assert(kv.first.status() != QSoundEffect::Error);
+    assert(s->status() != QSoundEffect::Error);
-    }
   }
 
   void update() {
@@ -75,20 +75,19 @@ private slots:
     if (!alert.equal(a)) {
       alert = a;
       // stop sounds
-      for (auto &kv : sounds) {
+      for (auto &[s, loops] : sounds) {
         // Only stop repeating sounds
-        auto &[sound, loops] = kv.second;
+        if (s->loopsRemaining() == QSoundEffect::Infinite) {
-        if (sound.loopsRemaining() == QSoundEffect::Infinite) {
+          s->stop();
-          sound.stop();
         }
       }
 
       // play sound
       if (alert.sound != AudibleAlert::NONE) {
-        auto &[sound, loops] = sounds[alert.sound];
+        auto &[s, loops] = sounds[alert.sound];
-        sound.setLoopCount(loops);
+        s->setLoopCount(loops);
-        sound.setVolume(volume);
+        s->setVolume(volume);
-        sound.play();
+        s->play();
       }
     }
   }
@@ -96,7 +95,7 @@ private slots:
 private:
   Alert alert;
   float volume = Hardware::MIN_VOLUME;
-  std::map<AudibleAlert, std::pair<QSoundEffect, int>> sounds;
+  QMap<AudibleAlert, QPair<QSoundEffect*, int>> sounds;
   SubMaster *sm;
 };