From 9763484300d3325d543249636fb2ac4ee24c33ab Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Tue, 9 Sep 2014 15:24:40 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20alsautils?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alsa-utils/boot/.calculate_directory | 2 - .../media-sound/alsa-utils/boot/alsasound.del | 1 - .../media-sound/alsa-utils/init.d/alsasound | 54 ------------------- .../3.2/6_ac_update_sync/revision/10 | 6 +++ 4 files changed, 6 insertions(+), 57 deletions(-) delete mode 100644 profiles/templates/3.1/2_ac_install_merge/media-sound/alsa-utils/boot/.calculate_directory delete mode 100644 profiles/templates/3.1/2_ac_install_merge/media-sound/alsa-utils/boot/alsasound.del delete mode 100644 profiles/templates/3.1/2_ac_install_merge/media-sound/alsa-utils/init.d/alsasound create mode 100644 profiles/templates/3.2/6_ac_update_sync/revision/10 diff --git a/profiles/templates/3.1/2_ac_install_merge/media-sound/alsa-utils/boot/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/media-sound/alsa-utils/boot/.calculate_directory deleted file mode 100644 index 0f7257bce..000000000 --- a/profiles/templates/3.1/2_ac_install_merge/media-sound/alsa-utils/boot/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate path=/etc/runlevels - diff --git a/profiles/templates/3.1/2_ac_install_merge/media-sound/alsa-utils/boot/alsasound.del b/profiles/templates/3.1/2_ac_install_merge/media-sound/alsa-utils/boot/alsasound.del deleted file mode 100644 index 9e8df8cee..000000000 --- a/profiles/templates/3.1/2_ac_install_merge/media-sound/alsa-utils/boot/alsasound.del +++ /dev/null @@ -1 +0,0 @@ -# Calculate name=alsasound append=remove diff --git a/profiles/templates/3.1/2_ac_install_merge/media-sound/alsa-utils/init.d/alsasound b/profiles/templates/3.1/2_ac_install_merge/media-sound/alsa-utils/init.d/alsasound deleted file mode 100644 index aabdff738..000000000 --- a/profiles/templates/3.1/2_ac_install_merge/media-sound/alsa-utils/init.d/alsasound +++ /dev/null @@ -1,54 +0,0 @@ -# Calculate format=patch -(\s*ebegin "Restoring Mixer Levels" - -\s*if \[ ! -r "\$\{alsastatedir\}/asound.state" \] ; then) -(\s*ewarn "No mixer config in \${alsastatedir}/asound.state, you have to unmute your card!") -(\s*eend 0 -\s*return 0 -\s*fi) -\1 - einfo "Setting up ALSA Mixer Levels" - # set output volumes to 70% - amixer scontrols | grep -v Mic | sed -nr "/Wave|Master|Front|LFE|Center|Side|Speaker|Surround|PCM/ s/.*'([^']+)'.*/\\\\1/p" | xargs -I {} amixer -q set "{}" 85% unmute &>/dev/null - # reduce beep - amixer scontrols | sed -nr "/Beep/ s/.*'([^']+)'.*/\\\\1/p" | xargs -I {} amixer -q set "{}" 10% mute &>/dev/null - # mute all mics - amixer scontrols | sed -nr "/Mic/ s/.*'([^']+)'.*/\\\\1/p" | xargs -I {} amixer -q set "{}" 0% mute &>/dev/null - save - if ! grep -q "PCM Playback Volume" ${alsastatedir}/asound.state - then - sed -ri "s/^\}/\ - control.99 \{\\n\ - iface MIXER\\n\ - name 'PCM Playback Volume'\\n\ - value.0 255\\n\ - value.1 255\\n\ - comment \{\\n\ - access 'read write user'\\n\ - type INTEGER\\n\ - count 2\\n\ - range '0 - 255'\\n\ - tlv '0000000100000008ffffec1400000014'\\n\ - dbmin -5100\\n\ - dbmax 0\\n\ - dbvalue.0 0\\n\ - dbvalue.1 0\\n\ - }\\n\ - \}\\n\ -\}\\n\ -/" ${alsastatedir}/asound.state && restore - fi -\3 -(\s*ebegin "Loading ALSA modules" -\s*eindent -\s*load_modules) -(\s*eoutdent) -(\s*eend \$\? \|\| return 1) -(\s*fi - -\s*if \[ ! -d /proc/asound \]; then) -\1 - RES=$? -\2 - eend $RES || return 1 -\4 diff --git a/profiles/templates/3.2/6_ac_update_sync/revision/10 b/profiles/templates/3.2/6_ac_update_sync/revision/10 new file mode 100644 index 000000000..943e07a05 --- /dev/null +++ b/profiles/templates/3.2/6_ac_update_sync/revision/10 @@ -0,0 +1,6 @@ +# Calculate dotall format=patch ini(update.revision)<10&&pkg(media-sound/alsa-utils)!= path=/etc/init.d name=alsasound merge=media-sound/alsa-utils + +#-ini(update.revision,10)-# + +\n\s*einfo "Setting up ALSA Mixer Levels".*?&&\s*restore\s*fi +\n\t\tewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!"