From 4a599c0eab555eccf0c1f7a746937c5379e067e7 Mon Sep 17 00:00:00 2001 From: deanlee Date: Sun, 7 Nov 2021 04:26:26 +0800 Subject: [PATCH] cleanup --- selfdrive/ui/soundd/sound.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/selfdrive/ui/soundd/sound.h b/selfdrive/ui/soundd/sound.h index 3e417a9c03..daff952c97 100644 --- a/selfdrive/ui/soundd/sound.h +++ b/selfdrive/ui/soundd/sound.h @@ -6,27 +6,27 @@ #include "selfdrive/ui/ui.h" const std::tuple sound_list[] = { - {AudibleAlert::CHIME_DISENGAGE, "disengaged.wav", false}, - {AudibleAlert::CHIME_ENGAGE, "engaged.wav", false}, - {AudibleAlert::CHIME_WARNING1, "warning_1.wav", false}, - {AudibleAlert::CHIME_WARNING2, "warning_2.wav", false}, - {AudibleAlert::CHIME_WARNING2_REPEAT, "warning_2.wav", true}, - {AudibleAlert::CHIME_WARNING_REPEAT, "warning_repeat.wav", true}, - {AudibleAlert::CHIME_ERROR, "error.wav", false}, - {AudibleAlert::CHIME_PROMPT, "error.wav", false}, + {AudibleAlert::CHIME_DISENGAGE, "disengaged.wav", false}, + {AudibleAlert::CHIME_ENGAGE, "engaged.wav", false}, + {AudibleAlert::CHIME_WARNING1, "warning_1.wav", false}, + {AudibleAlert::CHIME_WARNING2, "warning_2.wav", false}, + {AudibleAlert::CHIME_WARNING2_REPEAT, "warning_2.wav", true}, + {AudibleAlert::CHIME_WARNING_REPEAT, "warning_repeat.wav", true}, + {AudibleAlert::CHIME_ERROR, "error.wav", false}, + {AudibleAlert::CHIME_PROMPT, "error.wav", false}, }; class Sound : public QObject { public: explicit Sound(QObject *parent = 0); + +protected: void update(); void setAlert(const QString &alert_type, AudibleAlert sound); - protected: AudibleAlert current_sound = AudibleAlert::NONE; QString current_alert_type; float current_volume = Hardware::MIN_VOLUME; - QMap> sounds; SubMaster sm; };