status

Commit: 64930bb5943f874516346ed85e68d769610d25f4
Parent: 326fe81c65886bb0422d39b7876f3d09f5241a73
Author: opask
Date:   Wed, 14 Nov 2018 00:05:32 -0700

add alsa card and output to config.h

Diffstat:
M
config.def.h
 | 
6
++++++
M
status.c
 | 
8
++++----

2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/config.def.h b/config.def.h
@@ -3,3 +3,9 @@ static const char *mpdhost = "localhost";
 
 /* datetime format */
 static const char *timefmt = "%R";
+
+/* alsa card and output */
+/* card is whatever alsamixer lists as card, default is probably correct
+   output is the output from that specific card you want the vol from */
+static const char *alsacard = "default";
+static const char *alsaoutput = "Speaker";
diff --git a/status.c b/status.c
@@ -65,7 +65,7 @@ setstatus(char *str)
 }
 
 static long
-alsavol(void)
+alsavol(const char *card, const char *output)
 {
 	snd_mixer_t *handle;
 	snd_mixer_selem_id_t *sid;
@@ -74,13 +74,13 @@ alsavol(void)
 	long vol, min, max;
 
 	snd_mixer_open(&handle, 0);
-	snd_mixer_attach(handle, "default");
+	snd_mixer_attach(handle, card);
 	snd_mixer_selem_register(handle, NULL, NULL);
 	snd_mixer_load(handle);
 
 	snd_mixer_selem_id_malloc(&sid);
 	snd_mixer_selem_id_set_index(sid, 0);
-	snd_mixer_selem_id_set_name(sid, "Speaker");
+	snd_mixer_selem_id_set_name(sid, output);
 	elem = snd_mixer_find_selem(handle, sid);
 
 	snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, &vol);
@@ -159,7 +159,7 @@ main(void)
 		time = gettime(timefmt);
 		song = mpd(MPD_TAG_TITLE);
 		artist = mpd(MPD_TAG_ARTIST);
-		vol = alsavol();
+		vol = alsavol(alsacard, alsaoutput);
 
 		status = smprintf("[ %s - %s ][ %li%% ][ %s ]", artist, song,
 				vol, time);