Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MuteToggler@jebeaudet.com] Separate cmd line evaluation and executed on settings change #6651

Merged
merged 9 commits into from
Nov 29, 2024
Merged

[MuteToggler@jebeaudet.com] Separate cmd line evaluation and executed on settings change #6651

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1bdbc9e
Added new parameters for soundcard and input choice
Nov 22, 2024
e9cd3e2
Implicit input eval and improved soundcard eval
Nov 23, 2024
7376897
reordered. input must be evaluated before -D pulse eval
Nov 23, 2024
e5db34c
Changes due to code review
Nov 23, 2024
b98b9cf
Async calls via Util.spawn_async
Nov 23, 2024
3dcba7b
Removed remains of old implementation
Nov 23, 2024
673bebf
Update applet.js: Added 'this.evaluate_soundcard();' at the end of on…
claudiux Nov 24, 2024
a2ec1f1
Merge branch 'linuxmint:master' into master
lrademacher Nov 29, 2024
91edc64
Moved cli eval to subfunc, executed on cfg change
Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 21 additions & 19 deletions MuteToggler@jebeaudet.com/files/MuteToggler@jebeaudet.com/applet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function findFirstMatch(searchStrings, checkString) {
MyApplet.prototype = {
__proto__: Applet.IconApplet.prototype,

_init: async function(metadata, orientation, panel_height, instance_id) {
_init: function(metadata, orientation, panel_height, instance_id) {
try {
this.settings = new Settings.AppletSettings(this, UUID, instance_id);
VERBOSE = this.settings.getValue("verbose");
Expand Down Expand Up @@ -114,23 +114,6 @@ MyApplet.prototype = {
this.on_settings_changed();
}

this.amixer = "amixer";
await this.evaluate_soundcard();
await this.evaluate_input();

const parameters = ["", " -D pulse"];
for (let param of parameters) {
let cmd = this.amixer + param + " scontrols";
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) {
this.amixer += param;
log("Use mixer command '" + this.amixer + "'");
break;
}
}

this.applet_is_running = true;
this.set_not_muted_icon();
this.is_audio_muted();
Expand All @@ -152,7 +135,7 @@ MyApplet.prototype = {
}

VERBOSE = this.verbose;
this.evaluate_soundcard();
this.evaluate_cmd_line();
},

refresh_loop: function() {
Expand Down Expand Up @@ -262,6 +245,25 @@ MyApplet.prototype = {
});
},

evaluate_cmd_line: async function() {
this.amixer = "amixer";
await this.evaluate_soundcard();
await this.evaluate_input();

const parameters = ["", " -D pulse"];
for (let param of parameters) {
let cmd = this.amixer + param + " scontrols";
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) {
this.amixer += param;
log("Use mixer command '" + this.amixer + "'");
break;
}
}
},

on_applet_clicked: function(event) {
try{
let cmd = [
Expand Down