X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3status.c;h=9d9921d65fd74f48bf22a998742512d36b676f2f;hb=af5fd7b77ea00d6c1390e70310d51828016ab2b0;hp=eabcd6c68cbf79469ca105e0013673da42ad3718;hpb=38337511e9b5896006f276c111265c985b2af70d;p=i3%2Fi3status

diff --git a/i3status.c b/i3status.c
index eabcd6c..9d9921d 100644
--- a/i3status.c
+++ b/i3status.c
@@ -103,7 +103,7 @@ int main(int argc, char *argv[]) {
         };
 
         cfg_opt_t wireless_opts[] = {
-                CFG_STR("format_up", "W: (%quality at %essid) %ip", CFGF_NONE),
+                CFG_STR("format_up", "W: (%quality at %essid, %bitrate) %ip", CFGF_NONE),
                 CFG_STR("format_down", "W: down", CFGF_NONE),
                 CFG_END()
         };
@@ -151,6 +151,14 @@ int main(int argc, char *argv[]) {
                 CFG_END()
         };
 
+        cfg_opt_t volume_opts[] = {
+                CFG_STR("format", "♪: %volume", CFGF_NONE),
+                CFG_STR("device", "default", CFGF_NONE),
+                CFG_STR("mixer", "Master", CFGF_NONE),
+                CFG_INT("mixer_idx", 0, CFGF_NONE),
+                CFG_END()
+        };
+
         cfg_opt_t opts[] = {
                 CFG_STR_LIST("order", "{ipv6,\"run_watch DHCP\",\"wireless wlan0\",\"ethernet eth0\",\"battery 0\",\"cpu_temperature 0\",load,time}", CFGF_NONE),
                 CFG_SEC("general", general_opts, CFGF_NONE),
@@ -160,6 +168,7 @@ int main(int argc, char *argv[]) {
                 CFG_SEC("battery", battery_opts, CFGF_TITLE | CFGF_MULTI),
                 CFG_SEC("cpu_temperature", temp_opts, CFGF_TITLE | CFGF_MULTI),
                 CFG_SEC("disk", disk_opts, CFGF_TITLE | CFGF_MULTI),
+                CFG_SEC("volume", volume_opts, CFGF_TITLE | CFGF_MULTI),
                 CFG_SEC("ipv6", ipv6_opts, CFGF_NONE),
                 CFG_SEC("time", time_opts, CFGF_NONE),
                 CFG_SEC("ddate", ddate_opts, CFGF_NONE),
@@ -260,6 +269,12 @@ int main(int argc, char *argv[]) {
                         CASE_SEC("ddate")
                                 print_ddate(cfg_getstr(sec, "format"));
 
+                        CASE_SEC_TITLE("volume")
+                                print_volume(cfg_getstr(sec, "format"),
+                                             cfg_getstr(sec, "device"),
+                                             cfg_getstr(sec, "mixer"),
+                                             cfg_getint(sec, "mixer_idx"));
+
                         CASE_SEC_TITLE("cpu_temperature")
                                 print_cpu_temperature_info(atoi(title), cfg_getstr(sec, "format"));
                 }