Изменены шаблоны для настройки звука

* переход на идентификаторы звуковых карт вместо номеров
* удалена настройка alsa через pulse (настройка уже есть в пакете
alsa-plugins, впричём с проверкой наличия сервера)

profiles/templates/3.6/2_ac_install_merge/Remerge/utils-3.6.0.12

@@ -0,0 +1 @@
+# Calculate append=skip mergepkg(sys-apps/calculate-utils)>=3.6.0.12&&ini(merge-calculate.utils)<3.6.0.12 merge=media-sound/alsa-utils,media-sound/pulseaudio,kde-plasma/plasma-pa,kde-apps/kmix,media-sound/volumeicon,media-sound/pavucontrol,media-sound/qastools

profiles/templates/3.6/2_ac_install_merge/media-sound/alsa-utils/changemixer

@@ -1,6 +1,6 @@
 # Calculate path=/usr/bin comment=# chmod=755 
 #!/bin/sh
-if grep -q pulse /etc/asound.conf 2>/dev/null
+if grep -q "os_audio = pulse" /var/lib/calculate/calculate.env 2>/dev/null
 then
 	pavucontrol
 else

profiles/templates/3.6/3_ac_install_live/1-merge/kde-apps/kmix/kmix_default

@@ -1,7 +1,11 @@
 # Calculate chmod=0755
 #!/bin/bash
 
+#?cl_ver>=3.6.0.12#
+SELECT_CARD="#-os_audio_card_name_default-#"
+#!cl_ver#
 SELECT_CARD="#-cut(0,,#-list(os_audio_name,#-cut(0,,#-os_audio_default-#)-#)-#)-#"
+#cl_ver#
 DBUS_KMIX="/usr/bin/qdbus org.kde.kmix"
 if ! [[ -f ~/.config/kmixctrlrc ]]
 then

profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf

@@ -1,13 +1,8 @@
-# Calculate comment=# protected
+# Calculate comment=# protected pkg(sys-apps/calculate-utils)>=3.6.0.12
 #?os_audio==alsa#
-pcm.!default {
-    type hw
-    card #-cut(0,,#-os_audio_default-#)-#
-    device #-cut(1,,#-os_audio_default-#)-#
-}
 ctl.!default {
     type hw
-    card #-cut(0,,#-os_audio_default-#)-#
+    card #-cut(0,,#-os_audio_card_default-#)-#
 }
 pcm.!default {
     type plug
@@ -17,21 +12,11 @@ pcm.dmixer {
     type dmix
     ipc_key 1024
     slave {
-       pcm "hw:#-os_audio_default-#"
+       pcm {
+           type hw
+           card #-os_audio_card_default-#
+           device #-os_audio_device_default-#
+       }
     }
 }
 #os_audio#
-#?os_audio==pulseaudio#
-pcm.pulse {
-    type pulse
-}
-ctl.pulse {
-    type pulse
-}
-pcm.!default {
-    type pulse
-}
-ctl.!default {
-    type pulse
-}
-#os_audio#

profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf.old

@@ -0,0 +1,23 @@
+# Calculate comment=# name=asound.conf protected pkg(sys-apps/calculate-utils)<3.6.0.12
+#?os_audio==alsa#
+pcm.!default {
+    type hw
+    card #-cut(0,,#-os_audio_default-#)-#
+    device #-cut(1,,#-os_audio_default-#)-#
+}
+ctl.!default {
+    type hw
+    card #-cut(0,,#-os_audio_default-#)-#
+}
+pcm.!default {
+    type plug
+    slave.pcm "dmixer"
+}
+pcm.dmixer {
+    type dmix
+    ipc_key 1024
+    slave {
+       pcm "hw:#-os_audio_default-#"
+    }
+}
+#os_audio#

profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/alsa-utils/calculate.env

@@ -2,3 +2,8 @@
 
 [install]
 os_audio = alsa
+#?cl_ver>=3.6.0.12#
+#?os_audio_card_default!=&&os_audio_device_default!=&&pkg(sys-apps/calculate-utils)>=3.6.0.12#
+os_audio_hw = #-os_audio_card_default-#,#-os_audio_device_default-#
+#os_audio_card_default#
+#cl_ver#

profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pulseaudio/calculate.env

@@ -2,3 +2,8 @@
 
 [install]
 os_audio = pulseaudio
+#?cl_ver>=3.6.0.12#
+#?os_audio_card_default!=&&os_audio_device_default!=&&pkg(sys-apps/calculate-utils)>=3.6.0.12#
+os_audio_hw = #-os_audio_card_default-#,#-os_audio_device_default-#
+#os_audio_card_default#
+#cl_ver#