Skip to content

Commit

Permalink
Merge pull request linuxmint#6503 from claudiux/sound150_7.1.1
Browse files Browse the repository at this point in the history
[sound150@claudiux] v7.1.1 - Avoids loud cracking sound at shutdown
  • Loading branch information
claudiux authored Oct 16, 2024
2 parents 7555cee + 2dc5cba commit fc006d2
Show file tree
Hide file tree
Showing 18 changed files with 223 additions and 230 deletions.
3 changes: 1 addition & 2 deletions sound150@claudiux/files/sound150@claudiux/5.4/applet.js
Original file line number Diff line number Diff line change
Expand Up @@ -1806,7 +1806,6 @@ class Sound150Applet extends Applet.TextIconApplet {
this.settings.bind("tooltipShowArtistTitle", "tooltipShowArtistTitle", this.on_settings_changed);

this.settings.bind("alwaysCanChangeMic", "alwaysCanChangeMic", this.on_settings_changed);
this.settings.bind("avoidCrackingAtShutdown", "avoidCrackingAtShutdown", null);

this._sounds_settings = new Gio.Settings({ schema_id: CINNAMON_DESKTOP_SOUNDS });
this.settings.setValue("volumeSoundFile", this._sounds_settings.get_string(VOLUME_SOUND_FILE_KEY));
Expand Down Expand Up @@ -2207,7 +2206,7 @@ class Sound150Applet extends Applet.TextIconApplet {
}

on_applet_removed_from_panel() {
if (this.avoidCrackingAtShutdown && this._output && !this._output.is_muted) {
if (this._output && !this._output.is_muted) {
let old_volume = this.volume;
this._toggle_out_mute();
this.volume = old_volume;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@
"stepVolume",
"magneticOn",
"magnetic25On",
"alwaysCanChangeMic",
"avoidCrackingAtShutdown"
"alwaysCanChangeMic"
]
},
"sectionSound2": {
Expand Down Expand Up @@ -362,11 +361,6 @@
"tooltip": "Always show the 'Mute input' switch in the context menu.",
"default": true
},
"avoidCrackingAtShutdown": {
"type": "switch",
"description": "Try to avoid loud cracking sound at shutdown",
"default": true
},
"showMediaKeysOSD": {
"type": "combobox",
"default": "medium",
Expand Down
3 changes: 1 addition & 2 deletions sound150@claudiux/files/sound150@claudiux/6.4/applet.js
Original file line number Diff line number Diff line change
Expand Up @@ -1808,7 +1808,6 @@ class Sound150Applet extends Applet.TextIconApplet {
this.settings.bind("tooltipShowArtistTitle", "tooltipShowArtistTitle", this.on_settings_changed);

this.settings.bind("alwaysCanChangeMic", "alwaysCanChangeMic", this.on_settings_changed);
this.settings.bind("avoidCrackingAtShutdown", "avoidCrackingAtShutdown", null);

this._sounds_settings = new Gio.Settings({ schema_id: CINNAMON_DESKTOP_SOUNDS });
this.settings.setValue("volumeSoundFile", this._sounds_settings.get_string(VOLUME_SOUND_FILE_KEY));
Expand Down Expand Up @@ -2231,7 +2230,7 @@ class Sound150Applet extends Applet.TextIconApplet {
}

on_applet_removed_from_panel() {
if (this.avoidCrackingAtShutdown && this._output && !this._output.is_muted) {
if (this._output && !this._output.is_muted) {
let old_volume = this.volume;
this._toggle_out_mute();
this.volume = old_volume;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@
"stepVolume",
"magneticOn",
"magnetic25On",
"alwaysCanChangeMic",
"avoidCrackingAtShutdown"
"alwaysCanChangeMic"
]
},
"sectionSound2": {
Expand Down Expand Up @@ -378,11 +377,6 @@
"tooltip": "Always show the 'Mute input' switch in the context menu.",
"default": true
},
"avoidCrackingAtShutdown": {
"type": "switch",
"description": "Try to avoid loud cracking sound at shutdown",
"default": true
},
"showMediaKeysOSD": {
"type": "combobox",
"default": "medium",
Expand Down
5 changes: 5 additions & 0 deletions sound150@claudiux/files/sound150@claudiux/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### v7.1.1~20241016
* Avoids loud cracking sound at shutdown.
* Option removed. This is basic now.


### v7.1.0~20241013
* Option to try to avoid loud cracking sound at shutdown.
* Fixes https://github.com/linuxmint/cinnamon/issues/12446.
Expand Down
4 changes: 3 additions & 1 deletion sound150@claudiux/files/sound150@claudiux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ This *sound150@claudiux* applet is an enhancement of the Cinnamon system sound a

**It can display icons indicating that the microphone is muted or activated.**

**It avoids loud cracking sound at shutdown.**

**Sound volume:**

* **The volume step can be redefined** (from 1% to 10%).
Expand All @@ -32,7 +34,7 @@ From 131 to 150%: red icon (by default).

**You can redefine multimedia key bindings.**

Successfully tested on Cinnamon versions 2.8 to 6.2 (Linux Mint 17.3 to 22). Does not work on Cinnamon prior to version 2.8 (Linux Mint prior to 17.3).
Successfully tested on Cinnamon versions 2.8 to 6.4 (Linux Mint 17.3 to 22.1). Does not work on Cinnamon prior to version 2.8 (Linux Mint prior to 17.3).

## Dependencies

Expand Down
2 changes: 1 addition & 1 deletion sound150@claudiux/files/sound150@claudiux/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"max-instances": "1",
"description": "Enhanced sound applet",
"hide-configuration": false,
"version": "7.1.0",
"version": "7.1.1",
"cinnamon-version": [
"2.8",
"3.0",
Expand Down
38 changes: 19 additions & 19 deletions sound150@claudiux/files/sound150@claudiux/po/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: sound150@claudiux 6.16.0\n"
"Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-applets/"
"issues\n"
"POT-Creation-Date: 2024-10-12 16:33+0200\n"
"POT-Creation-Date: 2024-10-16 16:13+0200\n"
"PO-Revision-Date: 2024-07-31 18:45+0200\n"
"Last-Translator: Odyssey <[email protected]>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -45,11 +45,11 @@ msgstr "Tancar el reproductor"

#. 4.4/applet.js:591 4.4/applet.js:723 4.4/applet.js:727 5.4/applet.js:1102
#. 5.4/applet.js:1385 5.4/applet.js:1388 5.4/applet.js:1391 5.4/applet.js:1425
#. 5.4/applet.js:1434 5.4/applet.js:2644 5.4/applet.js:2678 4.6/applet.js:592
#. 5.4/applet.js:1434 5.4/applet.js:2649 5.4/applet.js:2683 4.6/applet.js:592
#. 4.6/applet.js:719 4.6/applet.js:723 2.8/applet.js:529 2.8/applet.js:761
#. 2.8/applet.js:765 6.4/applet.js:1103 6.4/applet.js:1386 6.4/applet.js:1389
#. 6.4/applet.js:1392 6.4/applet.js:1426 6.4/applet.js:1435 6.4/applet.js:2670
#. 6.4/applet.js:2704 3.4/applet.js:534 3.4/applet.js:766 3.4/applet.js:770
#. 6.4/applet.js:1392 6.4/applet.js:1426 6.4/applet.js:1435 6.4/applet.js:2675
#. 6.4/applet.js:2709 3.4/applet.js:534 3.4/applet.js:766 3.4/applet.js:770
msgid "Unknown Artist"
msgstr "Artista desconegut"

Expand All @@ -60,10 +60,10 @@ msgid "Unknown Album"
msgstr "Àlbum desconegut"

#. 4.4/applet.js:593 4.4/applet.js:739 5.4/applet.js:1104 5.4/applet.js:1419
#. 5.4/applet.js:1428 5.4/applet.js:1431 5.4/applet.js:1439 5.4/applet.js:2681
#. 5.4/applet.js:1428 5.4/applet.js:1431 5.4/applet.js:1439 5.4/applet.js:2686
#. 4.6/applet.js:594 4.6/applet.js:735 2.8/applet.js:531 2.8/applet.js:777
#. 6.4/applet.js:1105 6.4/applet.js:1420 6.4/applet.js:1429 6.4/applet.js:1432
#. 6.4/applet.js:1440 6.4/applet.js:2707 3.4/applet.js:536 3.4/applet.js:782
#. 6.4/applet.js:1440 6.4/applet.js:2712 3.4/applet.js:536 3.4/applet.js:782
msgid "Unknown Title"
msgstr "Títol desconegut"

Expand Down Expand Up @@ -154,19 +154,19 @@ msgstr "Micròfon"
msgid "Input device"
msgstr "Dispositiu d'entrada"

#. 4.4/applet.js:1392 5.4/applet.js:2824 4.6/applet.js:1414 2.8/applet.js:1639
#. 6.4/applet.js:2850 3.4/applet.js:1566
#. 4.4/applet.js:1392 5.4/applet.js:2829 4.6/applet.js:1414 2.8/applet.js:1639
#. 6.4/applet.js:2855 3.4/applet.js:1566
msgid "Choose player controls"
msgstr "Escollir els controls del reproductor"

#. 4.4/applet.js:1397 5.4/applet.js:2819 4.6/applet.js:1409 2.8/applet.js:1644
#. 6.4/applet.js:2845 3.4/applet.js:1571
#. 4.4/applet.js:1397 5.4/applet.js:2824 4.6/applet.js:1409 2.8/applet.js:1644
#. 6.4/applet.js:2850 3.4/applet.js:1571
msgid "Launch player"
msgstr "Iniciar reproductor"

#. 4.4/applet.js:1403 4.4/applet.js:1497 5.4/applet.js:2671 5.4/applet.js:2831
#. 4.4/applet.js:1403 4.4/applet.js:1497 5.4/applet.js:2676 5.4/applet.js:2836
#. 4.6/applet.js:1420 4.6/applet.js:1515 2.8/applet.js:1650 2.8/applet.js:1735
#. 6.4/applet.js:2697 6.4/applet.js:2857 3.4/applet.js:1577 3.4/applet.js:1662
#. 6.4/applet.js:2702 6.4/applet.js:2862 3.4/applet.js:1577 3.4/applet.js:1662
msgid "Volume"
msgstr "Volum"

Expand All @@ -175,8 +175,8 @@ msgstr "Volum"
#. 4.6->settings-schema.json->section3->description
#. 6.4->settings-schema.json->sectionSound1->title
#. 3.4->settings-schema.json->section3->description
#. 4.4/applet.js:1409 5.4/applet.js:2839 4.6/applet.js:1426 2.8/applet.js:1657
#. 6.4/applet.js:2865 3.4/applet.js:1584
#. 4.4/applet.js:1409 5.4/applet.js:2844 4.6/applet.js:1426 2.8/applet.js:1657
#. 6.4/applet.js:2870 3.4/applet.js:1584
msgid "Sound Settings"
msgstr "Opcions de so"

Expand All @@ -197,23 +197,23 @@ msgstr "Pulse Effects"
msgid "Are you sure you want to remove '%s'?"
msgstr "Segur que voleu eliminar '%s'?"

#. 5.4/applet.js:2687 6.4/applet.js:2713
#. 5.4/applet.js:2692 6.4/applet.js:2718
msgid "The 'playerctl' package is required!"
msgstr "Es necessita el paquet 'playerctl'!"

#. 5.4/applet.js:2688 6.4/applet.js:2714
#. 5.4/applet.js:2693 6.4/applet.js:2719
msgid "Please select 'Install playerctl' in this menu"
msgstr "Si us plau, seleccioneu 'Instal·la playerctl' en aquest menú"

#. 5.4/applet.js:2844 6.4/applet.js:2870
#. 5.4/applet.js:2849 6.4/applet.js:2875
msgid "Reload this applet"
msgstr "Refresca aquesta miniaplicació"

#. 5.4/applet.js:2850 6.4/applet.js:2876
#. 5.4/applet.js:2855 6.4/applet.js:2881
msgid "Remove sound applet"
msgstr "Elimina la miniaplicació"

#. 5.4/applet.js:2859 6.4/applet.js:2885
#. 5.4/applet.js:2864 6.4/applet.js:2890
msgid "Install playerctl"
msgstr "Instal·la playerctl"

Expand Down
38 changes: 19 additions & 19 deletions sound150@claudiux/files/sound150@claudiux/po/da.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: sound150@claudiux v1.0.0\n"
"Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-applets/"
"issues\n"
"POT-Creation-Date: 2024-10-12 16:33+0200\n"
"POT-Creation-Date: 2024-10-16 16:13+0200\n"
"PO-Revision-Date: 2023-12-25 11:24+0100\n"
"Last-Translator: Alan Mortensen <[email protected]>\n"
"Language-Team: Dansk-gruppen <[email protected]>\n"
Expand Down Expand Up @@ -46,11 +46,11 @@ msgstr "Afslut afspiller"

#. 4.4/applet.js:591 4.4/applet.js:723 4.4/applet.js:727 5.4/applet.js:1102
#. 5.4/applet.js:1385 5.4/applet.js:1388 5.4/applet.js:1391 5.4/applet.js:1425
#. 5.4/applet.js:1434 5.4/applet.js:2644 5.4/applet.js:2678 4.6/applet.js:592
#. 5.4/applet.js:1434 5.4/applet.js:2649 5.4/applet.js:2683 4.6/applet.js:592
#. 4.6/applet.js:719 4.6/applet.js:723 2.8/applet.js:529 2.8/applet.js:761
#. 2.8/applet.js:765 6.4/applet.js:1103 6.4/applet.js:1386 6.4/applet.js:1389
#. 6.4/applet.js:1392 6.4/applet.js:1426 6.4/applet.js:1435 6.4/applet.js:2670
#. 6.4/applet.js:2704 3.4/applet.js:534 3.4/applet.js:766 3.4/applet.js:770
#. 6.4/applet.js:1392 6.4/applet.js:1426 6.4/applet.js:1435 6.4/applet.js:2675
#. 6.4/applet.js:2709 3.4/applet.js:534 3.4/applet.js:766 3.4/applet.js:770
msgid "Unknown Artist"
msgstr "Ukendt kunstner"

Expand All @@ -61,10 +61,10 @@ msgid "Unknown Album"
msgstr "Ukendt album"

#. 4.4/applet.js:593 4.4/applet.js:739 5.4/applet.js:1104 5.4/applet.js:1419
#. 5.4/applet.js:1428 5.4/applet.js:1431 5.4/applet.js:1439 5.4/applet.js:2681
#. 5.4/applet.js:1428 5.4/applet.js:1431 5.4/applet.js:1439 5.4/applet.js:2686
#. 4.6/applet.js:594 4.6/applet.js:735 2.8/applet.js:531 2.8/applet.js:777
#. 6.4/applet.js:1105 6.4/applet.js:1420 6.4/applet.js:1429 6.4/applet.js:1432
#. 6.4/applet.js:1440 6.4/applet.js:2707 3.4/applet.js:536 3.4/applet.js:782
#. 6.4/applet.js:1440 6.4/applet.js:2712 3.4/applet.js:536 3.4/applet.js:782
msgid "Unknown Title"
msgstr "Ukendt titel"

Expand Down Expand Up @@ -155,19 +155,19 @@ msgstr "Mikrofon"
msgid "Input device"
msgstr "Inputenhed"

#. 4.4/applet.js:1392 5.4/applet.js:2824 4.6/applet.js:1414 2.8/applet.js:1639
#. 6.4/applet.js:2850 3.4/applet.js:1566
#. 4.4/applet.js:1392 5.4/applet.js:2829 4.6/applet.js:1414 2.8/applet.js:1639
#. 6.4/applet.js:2855 3.4/applet.js:1566
msgid "Choose player controls"
msgstr "Vælg kontrolelementer til afspiller"

#. 4.4/applet.js:1397 5.4/applet.js:2819 4.6/applet.js:1409 2.8/applet.js:1644
#. 6.4/applet.js:2845 3.4/applet.js:1571
#. 4.4/applet.js:1397 5.4/applet.js:2824 4.6/applet.js:1409 2.8/applet.js:1644
#. 6.4/applet.js:2850 3.4/applet.js:1571
msgid "Launch player"
msgstr "Start afspiller"

#. 4.4/applet.js:1403 4.4/applet.js:1497 5.4/applet.js:2671 5.4/applet.js:2831
#. 4.4/applet.js:1403 4.4/applet.js:1497 5.4/applet.js:2676 5.4/applet.js:2836
#. 4.6/applet.js:1420 4.6/applet.js:1515 2.8/applet.js:1650 2.8/applet.js:1735
#. 6.4/applet.js:2697 6.4/applet.js:2857 3.4/applet.js:1577 3.4/applet.js:1662
#. 6.4/applet.js:2702 6.4/applet.js:2862 3.4/applet.js:1577 3.4/applet.js:1662
msgid "Volume"
msgstr "Lydstyrke"

Expand All @@ -176,8 +176,8 @@ msgstr "Lydstyrke"
#. 4.6->settings-schema.json->section3->description
#. 6.4->settings-schema.json->sectionSound1->title
#. 3.4->settings-schema.json->section3->description
#. 4.4/applet.js:1409 5.4/applet.js:2839 4.6/applet.js:1426 2.8/applet.js:1657
#. 6.4/applet.js:2865 3.4/applet.js:1584
#. 4.4/applet.js:1409 5.4/applet.js:2844 4.6/applet.js:1426 2.8/applet.js:1657
#. 6.4/applet.js:2870 3.4/applet.js:1584
msgid "Sound Settings"
msgstr "Lydindstillinger"

Expand All @@ -198,23 +198,23 @@ msgstr ""
msgid "Are you sure you want to remove '%s'?"
msgstr ""

#. 5.4/applet.js:2687 6.4/applet.js:2713
#. 5.4/applet.js:2692 6.4/applet.js:2718
msgid "The 'playerctl' package is required!"
msgstr ""

#. 5.4/applet.js:2688 6.4/applet.js:2714
#. 5.4/applet.js:2693 6.4/applet.js:2719
msgid "Please select 'Install playerctl' in this menu"
msgstr ""

#. 5.4/applet.js:2844 6.4/applet.js:2870
#. 5.4/applet.js:2849 6.4/applet.js:2875
msgid "Reload this applet"
msgstr ""

#. 5.4/applet.js:2850 6.4/applet.js:2876
#. 5.4/applet.js:2855 6.4/applet.js:2881
msgid "Remove sound applet"
msgstr ""

#. 5.4/applet.js:2859 6.4/applet.js:2885
#. 5.4/applet.js:2864 6.4/applet.js:2890
msgid "Install playerctl"
msgstr ""

Expand Down
Loading

0 comments on commit fc006d2

Please sign in to comment.