From a3c0085e2bd44af9c713cbefd78673c1e37b8b09 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Wed, 17 Jan 2024 13:31:34 +0800 Subject: [PATCH] Sound: tidy --- src/detection/media/media_linux.c | 2 -- src/detection/sound/sound_bsd.c | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/detection/media/media_linux.c b/src/detection/media/media_linux.c index 35830f1b9..5dd673338 100644 --- a/src/detection/media/media_linux.c +++ b/src/detection/media/media_linux.c @@ -1,6 +1,5 @@ #include "fastfetch.h" #include "detection/media/media.h" -#include "common/thread.h" #include "util/stringUtils.h" #include @@ -11,7 +10,6 @@ #ifdef FF_HAVE_DBUS #include "common/dbus.h" #include "common/library.h" -#include "common/parsing.h" static bool getBusProperties(FFDBusData* data, const char* busName, FFMediaResult* result) { diff --git a/src/detection/sound/sound_bsd.c b/src/detection/sound/sound_bsd.c index 49575d355..3053c14d5 100644 --- a/src/detection/sound/sound_bsd.c +++ b/src/detection/sound/sound_bsd.c @@ -19,7 +19,7 @@ const char* ffDetectSound(FFlist* devices) uint32_t devmask = 0; if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devmask) < 0) continue; - if (!((1 << SOUND_MIXER_VOLUME) & devmask)) + if (!(devmask & SOUND_MASK_VOLUME)) continue; uint32_t mutemask = 0; @@ -31,13 +31,13 @@ const char* ffDetectSound(FFlist* devices) continue; uint32_t volume; - if (ioctl(fd, MIXER_READ(SOUND_MIXER_VOLUME), &volume) < 0) + if (ioctl(fd, SOUND_MIXER_READ_VOLUME, &volume) < 0) continue; FFSoundDevice* device = ffListAdd(devices); ffStrbufInitS(&device->identifier, path); ffStrbufInitF(&device->name, "%s %s", ci.longname, ci.hw_info); - device->volume = (1 << SOUND_MIXER_VOLUME) & mutemask + device->volume = mutemask & SOUND_MASK_VOLUME ? 0 : ((uint8_t) volume /*left*/ + (uint8_t) (volume >> 8) /*right*/) / 2; device->active = true;