[email protected]: Allow using PulseAudio (#6954)

Author: foxel

[email protected]/files/[email protected]/applet.js

@@ -16,7 +16,7 @@ const APPNAME = "MuteToggler";
 const UUID = APPNAME + "@jebeaudet.com";
 const HOME_DIR = GLib.get_home_dir();
 
-var VERBOSE = true; // VERBOSE value will be changed according to this applet settings.
+let VERBOSE = true; // VERBOSE value will be changed according to this applet settings.
 
 const POTENTIAL_INPUTS = ["'Capture'", "'Mic'"];
 
@@ -37,23 +37,34 @@ function logError(error) {
 bindtextdomain(UUID, HOME_DIR + "/.local/share/locale");
 function _(str) {
   let customTranslation = dgettext(UUID, str);
-  if(customTranslation != str) {
+  if(customTranslation !== str) {
     return customTranslation;
   }
   return gettext(str);
 }
 
 function findFirstMatch(searchStrings, checkString) {
-  for (let i = 0; i < searchStrings.length; i++) { 
-    if (checkString.includes(searchStrings[i])) { 
-      return searchStrings[i]; 
-    }  
-  } 
-  return null; // Return null if no match is found 
+  for (let i = 0; i < searchStrings.length; i++) {
+    if (checkString.includes(searchStrings[i])) {
+      return searchStrings[i];
+    }
+  }
+  return null; // Return null if no match is found
 }
 
 MyApplet.prototype = {
     __proto__: Applet.IconApplet.prototype,
+    settings: null,
+    use_pulseaudio: false,
+    soundcard: null,
+    keybinding: null,
+    use_symbolic_icon: false,
+    tint_symbolic_icon: false,
+    unmuted_color: null,
+    muted_color: null,
+    verbose: true,
+
+    applet_is_running: false,
 
     _init: function(metadata, orientation, panel_height, instance_id) {
         try {
@@ -66,6 +77,11 @@ MyApplet.prototype = {
             this.set_applet_tooltip(_("Click to mute/unmute microphone"));
 
             try {
+                this.settings.bindProperty(Settings.BindingDirection.IN,
+                                     "use_pulseaudio",
+                                     "use_pulseaudio",
+                                     this.on_settings_changed,
+                                     null);
                 this.settings.bindProperty(Settings.BindingDirection.IN,
                                      "soundcard",
                                      "soundcard",
@@ -105,9 +121,6 @@ MyApplet.prototype = {
             } catch (e) {
                 logError(e);
                 log("Error initializing from Settings, continuing.", true);
-                this.settings = null;
-                this.keybinding = null;
-                this.verbose = true
             }
 
             if (this.settings) {
@@ -135,25 +148,30 @@ MyApplet.prototype = {
         }
 
         VERBOSE = this.verbose;
+        // noinspection JSIgnoredPromiseFromCall
         this.evaluate_cmd_line();
     },
 
     refresh_loop: function() {
         this.is_audio_muted();
-        if (this.applet_is_running)
+        if (this.applet_is_running) {
             Mainloop.timeout_add(1000, Lang.bind(this, this.refresh_loop));
+        }
     },
 
     is_audio_muted: function() {
         try {
-            let cmd = [
+            const cmd = [
                 "sh",
                 "-c",
-                this.amixer + " sget " + this.input
-                ];
+                this.use_pulseaudio
+                    ? "pactl get-source-mute `pactl get-default-source`"
+                    : this.amixer + " sget " + this.input
+            ];
+            const match_string = this.use_pulseaudio ? " no" : "] [on]";
             Util.spawn_async(cmd, (stdout) => {
                 try{
-                    if(stdout.indexOf("] [on]") != -1){
+                    if(stdout.indexOf(match_string) !== -1){
                         this.set_not_muted_icon();
                     } else {
                         this.set_muted_icon();
@@ -168,7 +186,6 @@ MyApplet.prototype = {
     },
 
     set_not_muted_icon: function() {
-        this.current_icon = "not_muted";
         if (this.use_symbolic_icon) {
             this.set_applet_icon_symbolic_name("microphone-sensitivity-high-symbolic");
             if (this.tint_symbolic_icon) {
@@ -182,7 +199,6 @@ MyApplet.prototype = {
     },
 
     set_muted_icon: function() {
-        this.current_icon = "muted";
         if (this.use_symbolic_icon) {
             this.set_applet_icon_symbolic_name("microphone-disabled-symbolic");
             if (this.tint_symbolic_icon) {
@@ -198,24 +214,25 @@ MyApplet.prototype = {
     evaluate_soundcard: function() {
       return new Promise((resolve, reject) => {
         // only use specific soundcard if searchstring is not empty
-        if (this.soundcard.trim().length > 0) {
-          // per default use first soundcard 
-          this.soundcard_id = "0";
-          
+        if (this.soundcard?.trim().length > 0) {
           Util.spawn_async(["sh","-c","cat /proc/asound/cards"], (stdout) => {
             try {
-              // Split the result into lines 
+              // per default use first soundcard
+              let soundcard_id = "0";
+
+              // Split the result into lines
               let lines = stdout.split('\n');
 
               // Filter lines that contain the soundcard search string
               let filteredLines = lines.filter(line => line.includes(this.soundcard));
 
-              // Extract the field after splitting by space and getting the second field (index 1) 
+              // Extract the field after splitting by space and getting the second field (index 1)
               if (filteredLines.length > 0) {
-                this.soundcard_id = filteredLines[0].split(' ')[1];
+                soundcard_id = filteredLines[0].split(' ')[1];
               }
-              log("Use specific soundcard id: '" + this.soundcard_id + "'");
-              this.amixer = this.amixer + " -c " + this.soundcard_id;
+
+              log("Use specific soundcard id: '" + soundcard_id + "'");
+              this.amixer = this.amixer + " -c " + soundcard_id;
               resolve();
             } catch (e) {
               reject(e);
@@ -245,9 +262,13 @@ MyApplet.prototype = {
       });
     },
 
-    evaluate_cmd_line: async function() { 
+    evaluate_cmd_line: async function() {
+        if (this.use_pulseaudio) {
+            return;
+        }
+
         this.amixer = "amixer";
-        await this.evaluate_soundcard(); 
+        await this.evaluate_soundcard();
         await this.evaluate_input();
 
         const parameters = ["", " -D pulse"];
@@ -256,22 +277,24 @@ MyApplet.prototype = {
             log("Test mixer command '" + cmd + "'");
             // TODO: Make it async.
             let [res, stdout] = GLib.spawn_command_line_sync(cmd);
-            if (res && to_string(stdout).indexOf(this.input) != -1) {
+            if (res && to_string(stdout).indexOf(this.input) !== -1) {
                 this.amixer += param;
                 log("Use mixer command '" + this.amixer + "'");
                 break;
             }
         }
     },
 
-    on_applet_clicked: function(event) {
+    on_applet_clicked: function(_event) {
         try{
             let cmd = [
                 "sh",
                 "-c",
-                this.amixer + " set " + this.input + " toggle"
+                this.use_pulseaudio
+                    ? "pactl set-source-mute `pactl get-default-source` toggle"
+                    : this.amixer + " set " + this.input + " toggle"
             ];
-            Util.spawn_async(cmd, (stdout) => {
+            Util.spawn_async(cmd, (_stdout) => {
                 this.is_audio_muted();
             });
         }catch(e){
@@ -289,7 +312,7 @@ function MyApplet(metadata, orientation, panel_height, instance_id) {
     this._init(metadata, orientation, panel_height, instance_id);
 }
 
+// noinspection JSUnusedLocalSymbols
 function main(metadata, orientation, panel_height, instance_id) {
-    let myApplet = new MyApplet(metadata, orientation, panel_height, instance_id);
-    return myApplet;
+    return new MyApplet(metadata, orientation, panel_height, instance_id);
 }

[email protected]/files/[email protected]/settings-schema.json

@@ -3,11 +3,18 @@
     "type": "section",
     "description": "Soundcard settings",
     "keys": [
+      "use_pulseaudio",
       "soundcard"
     ]
   },
+  "use_pulseaudio": {
+    "type": "switch",
+    "description": "Use PulseAudio (default: ALSA)",
+    "default": false
+  },
   "soundcard": {
     "type": "entry",
+    "dependency": "!use_pulseaudio",
     "description": "Soundcard search string in /proc/asound/cards (empty: deactivate)",
     "default": ""
   },