commit 0c78ff4aa496531c87344a6a31cb7f605c406161
parent feeaf4503b5c9e401fe5d5c1e2c8317ba2c6cca8
Author: Gildasio Junior <gildasiojunior@riseup.net>
Date: Mon, 24 Mar 2025 09:27:17 -0300
Update patch to use unsed var instead of void
It was triggering an error:
config.h:90:7: error: initialization of ‘const char * (*)(const char *)’ from incompatible pointer type ‘const char * (*)(void)’ [-Wincompatible-pointer-types]
90 | { alsa_master_vol, ",{\"name\":\"time\",\"full_text\":\"♪ %s\",\"color\":\"#bd93f9\"}", NULL },
| ^~~~~~~~~~~~~~~
Diffstat:
2 files changed, 108 insertions(+), 0 deletions(-)
diff --git a/tools.suckless.org/slstatus/patches/alsa-master/index.md b/tools.suckless.org/slstatus/patches/alsa-master/index.md
@@ -12,7 +12,9 @@ if the Master interface is on.
Download
--------
* [slstatus-alsa-master-20230420-84a2f11.diff](slstatus-alsa-master-20230420-84a2f11.diff)
+* [slstatus-alsa-master-20250324-f68f492.diff](slstatus-alsa-master-20250324-f68f492.diff)
Authors
-------
* William Rabbermann <willrabbermann@gmail.com>
+* gildasio <gildasiojunior@riseup.net) (update to 1.0)
diff --git a/tools.suckless.org/slstatus/patches/alsa-master/slstatus-alsa-master-20250324-f68f492.diff b/tools.suckless.org/slstatus/patches/alsa-master/slstatus-alsa-master-20250324-f68f492.diff
@@ -0,0 +1,106 @@
+diff --git a/Makefile b/Makefile
+index 2f93b87..41d5e9a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,6 +6,7 @@ include config.mk
+
+ REQ = util
+ COM =\
++ components/alsa_master_vol\
+ components/battery\
+ components/cpu\
+ components/datetime\
+diff --git a/components/alsa_master_vol.c b/components/alsa_master_vol.c
+new file mode 100644
+index 0000000..acc283b
+--- /dev/null
++++ b/components/alsa_master_vol.c
+@@ -0,0 +1,64 @@
++/* Created by William Rabbermann */
++#include <stdio.h>
++#include <stdbool.h>
++#include <string.h>
++#include "../util.h"
++
++#define TMP_BUF_SIZE 14
++#define VOL_BUF_SIZE 5
++
++const char *
++alsa_master_vol(const char *unused)
++{
++ bool MASTER_IS_MUTED = true;
++ char tmp_buf[TMP_BUF_SIZE];
++ short b;
++ unsigned short i = 0;
++
++ FILE *fp = popen("amixer get Master | tail -c13", "r");
++ char ch;
++ while ((ch = fgetc(fp)) != EOF && i < TMP_BUF_SIZE)
++ tmp_buf[i++] = ch;
++ tmp_buf[i] = '\0';
++ pclose(fp);
++
++ b = i - 1;
++ while (b >= 0)
++ {
++ if ('[' == tmp_buf[b])
++ {
++ if (tmp_buf[b+1] == 'o' && tmp_buf[b+2] == 'n')
++ MASTER_IS_MUTED = false;
++ b -= 3;
++ break;
++ }
++ b--;
++ }
++
++ if (MASTER_IS_MUTED) return bprintf("MUTE");
++ else
++ {
++ char vol_buf[VOL_BUF_SIZE];
++ while (b >= 0)
++ {
++ if ('[' == tmp_buf[b])
++ break;
++ b--;
++ }
++
++ i = 0;
++ while (i < VOL_BUF_SIZE)
++ {
++ b++;
++ if (']' == tmp_buf[b])
++ {
++ vol_buf[i] = '\0';
++ break;
++ }
++ else
++ vol_buf[i++] = tmp_buf[b];
++ }
++
++ return bprintf("%s", vol_buf);
++ }
++}
+diff --git a/config.def.h b/config.def.h
+index 93a875a..6074441 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -58,6 +58,7 @@ static const char unknown_str[] = "n/a";
+ * uid UID of current user NULL
+ * uptime system uptime NULL
+ * username username of current user NULL
++ * alsa_master_vol ALSA Master device volume NULL
+ * vol_perc OSS/ALSA volume in percent mixer file (/dev/mixer)
+ * NULL on OpenBSD
+ * wifi_perc WiFi signal in percent interface name (wlan0)
+diff --git a/slstatus.h b/slstatus.h
+index b0f2564..415afc1 100644
+--- a/slstatus.h
++++ b/slstatus.h
+@@ -78,6 +78,7 @@ const char *uid(void);
+
+ /* volume */
+ const char *vol_perc(const char *card);
++const char *alsa_master_vol(const char *unused);
+
+ /* wifi */
+ const char *wifi_perc(const char *interface);
