Browse Source

rework mixer settings, add system specific scripts

Waldemar Brodkorb 9 years ago
parent
commit
986c6447ed

+ 5 - 0
package/alsa-utils/Makefile

@@ -36,6 +36,11 @@ endif
 alsa-utils-install:
 	${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin
 	${CP} ${WRKINST}/usr/bin/{aplay,amixer,arecord} ${IDIR_ALSA_UTILS}/usr/bin
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+	$(INSTALL_DIR) $(IDIR_ALSA_UTILS)/etc/amixer.d
+	$(INSTALL_BIN) ./files/raspberry-pi.sh \
+		$(IDIR_ALSA_UTILS)/etc/amixer.d
+endif
 ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y)
 	${INSTALL_BIN} ${WRKINST}/usr/bin/alsamixer \
 		${IDIR_ALSA_UTILS}/usr/bin

+ 0 - 2
package/alsa-utils/files/alsa-utils.postinst

@@ -1,5 +1,3 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
 add_rcconf amixer NO
-add_rcconf amixer_volume "80%"
-add_rcconf amixer_mixer "Master PCM"

+ 2 - 6
package/alsa-utils/files/amixer.init

@@ -11,15 +11,11 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	for mixer in $amixer_mixer; do
-		amixer set $mixer on
-		amixer set $mixer $amixer_volume
+	for shell in $(ls /etc/amixer.d/*.sh); do
+		./$shell >/dev/null
 	done
 	;;
 stop)
-	for mixer in $amixer_mixer; do
-		amixer set $mixer off
-	done
 	;;
 restart)
 	sh $0 stop

+ 15 - 0
package/alsa-utils/files/raspberry-pi.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+/usr/bin/amixer -c 1 sset "Mic Boost" 0
+/usr/bin/amixer -c 1 sset "Input Mux" "Line In"
+/usr/bin/amixer -c 1 sset "Mic" nocap
+/usr/bin/amixer -c 1 sset "Line" cap
+/usr/bin/amixer -c 1 sset "Sidetone" 0
+/usr/bin/amixer -c 1 sset "Output Mixer Line Bypass" off
+/usr/bin/amixer -c 1 sset "Output Mixer Mic Sidetone" on
+/usr/bin/amixer -c 1 sset "Store DC Offset" off
+/usr/bin/amixer -c 1 sset "Output Mixer HiFi" on
+/usr/bin/amixer -c 1 sset "ADC High Pass Filter" on
+/usr/bin/amixer -c 1 sset "Playback Deemphasis" on
+/usr/bin/amixer -c 1 sset "Master Playback ZC" off
+/usr/bin/amixer -c 1 sset Master 80%