Attachment #7526 for bug #34609

View | Details | Raw Unified | Return to bug 34609
Collapse All | Expand All




diff --git a/src/prefs.c b/src/prefs.c
index e608d8f..41e421c 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -61,6 +61,7 @@ static const gchar *vol_control_commands[] = {
 	"gnome-alsamixer",
 	"xfce4-mixer",
 	"alsamixergui",
+	"alsamixer",
 	NULL
 };
 
@@ -185,7 +186,9 @@ prefs_get_string(const gchar *key, const gchar *def)
 	 */
 	if (!g_strcmp0(key, "VolumeControlCommand")) {
 		const gchar *cmd = find_vol_control_command();
-		if (cmd)
+		if (cmd == "alsamixer")
+			return g_strdup("xterm -e alsamixer");
+		else if (cmd)
 			return g_strdup(cmd);
 	}
 

Lines 11-16 Url: https://github.com/nicklan/pnmixer Link Here

(-)a/pnmixer.spec (+4 lines)
11	Source: %name-%version.tar	11	Source: %name-%version.tar
12	Patch: %name-%version-%release.patch	12	Patch: %name-%version-%release.patch
13		13
		14	# https://github.com/nicklan/pnmixer/pull/177
		15	Patch1: added-alsamixer.patch
		16
14	BuildRequires(pre): rpm-build-licenses rpm-macros-cmake	17	BuildRequires(pre): rpm-build-licenses rpm-macros-cmake
15	BuildRequires: cmake gettext libalsa-devel libnotify-devel	18	BuildRequires: cmake gettext libalsa-devel libnotify-devel
16	%if_without gtk3	19	%if_without gtk3
Lines 39-44 Feel free to try and to give some feedback. Link Here
39	%prep	42	%prep
40	%setup	43	%setup
41	%patch -p1	44	%patch -p1
		45	%patch1 -p1
42		46
43	%build	47	%build
44	%cmake \	48	%cmake \

Return to bug 34609

Line 0 Link Here

(-)a/added-alsamixer.patch (+23 lines)
	1	diff --git a/src/prefs.c b/src/prefs.c
	2	index e608d8f..41e421c 100644
	3	--- a/src/prefs.c
	4	+++ b/src/prefs.c
	5	@@ -61,6 +61,7 @@ static const gchar *vol_control_commands[] = {
	6	"gnome-alsamixer",
	7	"xfce4-mixer",
	8	"alsamixergui",
	9	+ "alsamixer",
	10	NULL
	11	};
	12
	13	@@ -185,7 +186,9 @@ prefs_get_string(const gchar key, const gchar def)
	14	*/
	15	if (!g_strcmp0(key, "VolumeControlCommand")) {
	16	const gchar *cmd = find_vol_control_command();
	17	- if (cmd)
	18	+ if (cmd == "alsamixer")
	19	+ return g_strdup("xterm -e alsamixer");
	20	+ else if (cmd)
	21	return g_strdup(cmd);
	22	}
	23