extra/aumix: added missing initd and patches

This commit is contained in:
Natanael Copa 2009-03-26 08:28:23 +00:00
parent 44ddbd6cdc
commit 753c8ec5f7
4 changed files with 115 additions and 0 deletions

View File

@ -0,0 +1,16 @@
Fix mute script: save volume and then set it to 0 instead of saving it directly
to 0. Bug #122087.
Index: aumix-2.8/src/mute
===================================================================
--- aumix-2.8.orig/src/mute
+++ aumix-2.8/src/mute
@@ -8,7 +8,8 @@
volumes=$(aumix -vq |tr -d ,)
if [ $(echo $volumes | awk '{print $2}') -ne 0 -o \
$(echo $volumes | awk '{print $3}') -ne 0 ]; then
- aumix -S -v 0
+ aumix -S
+ aumix -v 0
else
aumix -L > /dev/null
fi

View File

@ -0,0 +1,12 @@
diff -Naur aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
--- aumix-2.8.orig/src/common.c 2002-10-29 13:27:51.000000000 -0800
+++ aumix-2.8/src/common.c 2004-07-22 01:28:07.684999900 -0700
@@ -591,7 +591,7 @@
char filename[PATH_MAX];
if (save_filename == NULL) {
home = getenv("HOME");
- if ((strlen(home) + strlen(AUMIXRC) + 2) < PATH_MAX) {
+ if (home && (strlen(home) + strlen(AUMIXRC) + 2) < PATH_MAX) {
sprintf(filename, "%s/.%s", home, AUMIXRC);
setfile = CheckAndOpen(filename, mode);
}

View File

@ -0,0 +1,45 @@
--- a/src/common.c 2002-11-28 14:22:00.000000000 +0100
+++ b/src/common.c 2002-11-28 14:23:11.000000000 +0100
@@ -116,6 +116,7 @@
int main(int argc, char *argv[])
{
int optn, ii;
+ int save = 0, load = 0;
#ifdef HAVE_CURSES
int setcolors = FALSE;
#endif /* HAVE_CURSES */
@@ -171,14 +172,10 @@
break;
#endif /* HAVE_CURSES */
case 'S': /* Save to file. */
- if (mixer_fd == -1)
- ErrorExitWarn(InitializeMixer(device_filename), 'e');
- ErrorExitWarn(SaveSettings(), 'e');
+ save = 1;
break;
case 'L': /* Load from file. */
- if (mixer_fd == -1)
- ErrorExitWarn(InitializeMixer(device_filename), 'e');
- ErrorExitWarn(LoadSettings(), 'e');
+ load = 1;
break;
#if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
case 'I': /* User asked for interactive mode. */
@@ -194,6 +191,17 @@
}
}
}
+ if (save | load) {
+ if (mixer_fd == -1)
+ ErrorExitWarn(InitializeMixer(device_filename), 'e');
+ if (save)
+ ErrorExitWarn(SaveSettings(), 'e');
+ else
+ ErrorExitWarn(LoadSettings(), 'e');
+ close(mixer_fd);
+ exit(EXIT_SUCCESS);
+ }
+
#if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
/* Be interactive if no options were given. */
if (!interactive && argc <= 1)

42
extra/aumix/aumix.initd Normal file
View File

@ -0,0 +1,42 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/files/aumix.rc6,v 1.12 2007/03/25 13:05:51 drac Exp $
depend() {
use modules hotplug coldplug alsasound
}
checkconfig() {
if ! grep -q -E 'sound|OSS|sparcaudio' /proc/devices && [ ! -d /proc/asound ] ; then
eerror "Sound support has not been compiled into the kernel,"
eerror "or is disabled. Please check that the correct modules"
eerror "is loaded."
return 1
fi
# /dev/mixer can be a symlink
if [ ! -e /dev/mixer ] ; then
eerror "/dev/mixer does not exist, please create it, or load the"
eerror "correct modules to enable your card's mixer"
return 1
fi
}
start() {
checkconfig || return 1
if [ -f /etc/aumixrc ] ; then
ebegin "Loading Mixer settings"
/usr/bin/aumix -f /etc/aumixrc -L >/dev/null 2>&1
else
ebegin "Setting Mixer settings"
/usr/bin/aumix -v75 -c75 -w75 >/dev/null 2>&1
fi
eend $?
}
stop() {
checkconfig || return 1
ebegin "Saving Mixer settings"
/usr/bin/aumix -f /etc/aumixrc -S >/dev/null 2>&1
eend $?
}