diff --git a/asound.conf b/asound.conf
index cf8ebfa..84821c7 100644
--- a/asound.conf
+++ b/asound.conf
@@ -1,202 +1,151 @@
-# Infos from /proc/asound
 #
-# devices
-#  0: [ 0]   : control
-#  4: [ 0- 0]: hardware dependent
-# 16: [ 0- 0]: digital audio playback
-# 24: [ 0- 0]: digital audio capture
-# 33:        : timer
-#
-# pcm
-# 00-00: hifiaudio mc1n2-da0-0 :  : playback 1 : capture 1
-#
-# timers
-# G0: system timer : 5000.000us (10000000 ticks)
-# P0-0-0: PCM playback 0-0-0 : SLAVE
-# P0-0-1: PCM capture 0-0-1 : SLAVE
+# Copyright(c) 2011 The CyanogenMod Project
 #
 
-hwdep.mc1n2 {
-	type hw
-	card 0
+# ----------------------------------------
+#  PCM Interface
+#
+
+pcm.AndroidPlayback {
+        type hooks
+        slave.pcm {
+		type hw
+		card 0
+		device 0
+        }
+        hooks.0 {
+                type ctl_elems
+                hook_args [
+                        {
+                                name "Master Playback Volume"
+            			value.0 93
+            			value.1 93
+                        }
+                        {
+                                name "Master Playback Switch"
+            			value.0 true
+            			value.1 true
+                        }
+                        {
+                                name "Speaker Playback Volume"
+            			value.0 31
+            			value.1 31
+                        }
+                        {
+                                name "Speaker Playback Switch"
+            			value.0 true
+            			value.1 true
+                        }
+                ]
+        }
 }
 
+pcm.AndroidPlayback_Speaker {
+        type hooks
+        slave.pcm {
+		type hw
+		card 0
+		device 0
+        }
+        hooks.0 {
+                type ctl_elems
+                hook_args [
+                        {
+                                name "Master Playback Volume"
+            			value.0 93
+            			value.1 93
+                        }
+                        {
+                                name "Master Playback Switch"
+            			value.0 true
+            			value.1 true
+                        }
+                        {
+                                name "Speaker Playback Volume"
+            			value.0 31
+            			value.1 31
+                        }
+                        {
+                                name "Speaker Playback Switch"
+            			value.0 true
+            			value.1 true
+                        }
+                ]
+        }
+}
+
+pcm.AndroidPlayback_Speaker_normal {
+        type hooks
+        slave.pcm {
+		type hw
+		card 0
+		device 0
+        }
+        hooks.0 {
+                type ctl_elems
+                hook_args [
+                        {
+                                name "Master Playback Volume"
+            			value.0 93
+            			value.1 93
+                        }
+                        {
+                                name "Master Playback Switch"
+            			value.0 true
+            			value.1 true
+                        }
+                        {
+                                name "Speaker Playback Volume"
+            			value.0 31
+            			value.1 31
+                        }
+                        {
+                                name "Speaker Playback Switch"
+            			value.0 true
+            			value.1 true
+                        }
+                ]
+        }
+}
+
+pcm.AndroidCapture {
+	type hooks
+        slave.pcm {
+		type hw
+		card 0
+		device 0
+        }
+	hooks.0 {
+		type ctl_elems
+		hook_args [
+			{
+				name 'Mic 1 Gain Volume'
+				value 3
+			}
+			{
+				name 'DACVOICE SRC'
+				value DIR0
+			}
+			{
+				name 'DACVOICE SRC'
+				value DIR0
+			}
+		]
+	}
+}
+
+
 # ----------------------------------------
 #  Mixer Interface
 #
 
-ctl.mc1n2 {
-	type hw
-	card 0
-}
-
 ctl.AndroidPlayback {
-	type hw
-	card 0  # C1YMU823
+    type hw
+    card 0
 }
 
 ctl.AndroidCapture {
-	type hw
-	card 0  # C1YMU823
+    type hw
+    card 0
 }
 
-# ----------------------------------------
-#  PCM Interface Playback
-#
-
-pcm.hifi {
-	type plug
-	slave.pcm {
-		type hw
-		card 0
-		device 0
-		format S16_LE
-		channels 2
-		rate 44100
-	}
-}
-
-pcm.voice {
-	type plug
-	slave.pcm {
-		type hw
-		card 0
-		device 1
-		format S16_LE
-		channels 1
-		rate 8000
-	}
-}
-
-pcm.bluetooth {
-	type plug
-	slave.pcm {
-		type hw
-		card 0
-		device 2
-		format S16_LE
-		channels 1
-		rate 8000
-	}
-}
-
-pcm.AndroidPlayback {
-	type hooks
-	slave.pcm {
-		type hw
-		card 0
-		device 16	# Must be of type "digital audio playback"
-	}
-}
-
-pcm.AndroidPlayback_Speaker {
-	type hooks
-	slave.pcm {
-		type hw
-		card 0
-		device 16	# Must be of type "digital audio playback"
-	}
-}
-
-pcm.AndroidPlayback_Speaker_normal {
-	type hooks
-	slave.pcm {
-		type hw
-		card 0
-		device 16	# Must be of type "digital audio playback"
-	}
-}
-
-pcm.AndroidPlayback_Headset {
-	type hooks
-	slave.pcm {
-		type hw
-		card 0
-		device 16	# Must be of type "digital audio playback"
-	}
-}
-
-pcm.AndroidPlayback_Speaker_incall {
-	type hooks
-	slave.pcm {
-		type hw
-		card 0
-		device 16	# Must be of type "digital audio playback"
-	}
-}
-
-pcm.AndroidPlayback_Headset_incall {
-	type hooks
-	slave.pcm {
-		type hw
-		card 0
-		device 16	# Must be of type "digital audio playback"
-	}
-}
-
-pcm.AndroidPlayback_Earpiece_incall {
-	type hooks
-	slave.pcm {
-		type hw
-		card 0
-		device 16	# Must be of type "digital audio playback"
-	}
-}
-
-pcm.AndroidPlayback_Bluetooth {
-	type hooks
-	slave.pcm {
-		type hw
-		card 0
-		device 16	# Must be of type "digital audio playback"
-	}
-}
-
-pcm.AndroidPlayback_Bluetooth_incall {
-	type hooks
-	slave.pcm {
-		type hw
-		card 0
-		device 16	# Must be of type "digital audio playback"
-	}
-}
-
-# ----------------------------------------
-#  PCM Interface Capture
-#
-
-pcm.AndroidCapture {
-	type hooks
-	slave.pcm {
-		type hw
-		card 0
-		device 24	# Must be of type "digital audio playback"
-	}
-}
-
-pcm.AndroidCapture_Microphone {
-	type hooks
-	slave.pcm {
-		type hw
-		card 0
-		device 24	# Must be of type "digital audio playback"
-	}
-}
-
-pcm.AndroidCapture_Speaker_normal {
-	type hooks
-	slave.pcm {
-		type hw
-		card 0
-		device 24	# Must be of type "digital audio playback"
-	}
-}
-
-pcm.AndroidCapture_Speaker {
-	type hooks
-	slave.pcm {
-		type hw
-		card 0
-		device 24	# Must be of type "digital audio playback"
-	}
-}