fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-29 08:13:44 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Sound: tidy

Browse Source
This commit is contained in:
Carter Li
2024-01-17 13:31:34 +08:00
parent c8f28e4c79
commit a3c0085e2b
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/media/media_linux.c
-2
View File
@@ -1,6 +1,5 @@
#include "fastfetch.h"
#include "detection/media/media.h"
#include "common/thread.h"
#include "util/stringUtils.h"
#include <string.h>
@@ -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)
{
src/detection/sound/sound_bsd.c
+3 -3
View File
@@ -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;