more name hint interace updates

- add long card name to device description
- create empty PCM plugin to allow right hint description parsing
- reorder devices in alsa.conf
- make namehint more configurable (using default.namehint.showall switch)
- add two levels basic and exteded for hints to default configuration files
- do not show direct device aliases
- removed all known memory leaks

src/conf/alsa.conf

@@ -47,8 +47,17 @@ cards.@hooks [
 	}
 ]
 
+#
 # defaults
+#
 
+# show all name hints also for definitions without hint {} section
+defaults.namehint.showall off
+# show just basic name hints
+defaults.namehint.basic on
+# show extended name hints
+defaults.namehint.extended off
+#
 defaults.ctl.card 0
 defaults.pcm.card 0
 defaults.pcm.device 0
@@ -101,6 +110,26 @@ defaults.timer.subdevice 0
 #  PCM interface
 #
 
+# redirect to load-on-demand extended pcm definitions
+pcm.cards cards.pcm
+
+pcm.default cards.pcm.default
+pcm.front cards.pcm.front
+pcm.rear cards.pcm.rear
+pcm.center_lfe cards.pcm.center_lfe
+pcm.side cards.pcm.side
+pcm.surround40 cards.pcm.surround40
+pcm.surround41 cards.pcm.surround41
+pcm.surround50 cards.pcm.surround50
+pcm.surround51 cards.pcm.surround51
+pcm.surround71 cards.pcm.surround71
+pcm.iec958 cards.pcm.iec958
+pcm.spdif iec958
+pcm.dmix cards.pcm.dmix
+pcm.dsnoop cards.pcm.dsnoop
+pcm.modem cards.pcm.modem
+pcm.phoneline cards.pcm.phoneline
+
 pcm.hw {
 	@args [ CARD DEV SUBDEV ]
 	@args.CARD {
@@ -141,7 +170,13 @@ pcm.hw {
 	card $CARD
 	device $DEV
 	subdevice $SUBDEV
-	hint 0
+	hint {
+		show {
+			@func refer
+			name defaults.namehint.extended
+		}
+		description "Direct hardware device without any conversions"
+	}
 }
 
 pcm.plughw {
@@ -187,7 +222,13 @@ pcm.plughw {
 		device $DEV
 		subdevice $SUBDEV
 	}
-	hint 0
+	hint {
+		show {
+			@func refer
+			name defaults.namehint.extended
+		}
+		description "Hardware device with all software conversions"
+	}
 }
 
 pcm.plug {
@@ -246,35 +287,35 @@ pcm.file {
 }
 
 pcm.null {
-	hint.description "Discard all samples (playback) or generate zero samples (capture)"
 	type null
+	hint {
+		show {
+			@func refer
+			name defaults.namehint.basic
+		}
+		description "Discard all samples (playback) or generate zero samples (capture)"
+	}
 }
 
-# redirect to load-on-demand extended pcm definitions
-pcm.cards cards.pcm
-# some links for easy use
-pcm.front cards.pcm.front
-pcm.rear cards.pcm.rear
-pcm.center_lfe cards.pcm.center_lfe
-pcm.side cards.pcm.side
-pcm.surround40 cards.pcm.surround40
-pcm.surround41 cards.pcm.surround41
-pcm.surround50 cards.pcm.surround50
-pcm.surround51 cards.pcm.surround51
-pcm.surround71 cards.pcm.surround71
-pcm.iec958 cards.pcm.iec958
-pcm.spdif cards.pcm.iec958
-pcm.modem cards.pcm.modem
-pcm.phoneline cards.pcm.phoneline
-
-pcm.default cards.pcm.default
-pcm.dmix cards.pcm.dmix
-pcm.dsnoop cards.pcm.dsnoop
-
 #
 #  Control interface
 #
 	
+ctl.default {
+	type hw
+	card {
+		@func getenv
+		vars [
+			ALSA_CTL_CARD
+			ALSA_CARD
+		]
+		default {
+			@func refer
+			name defaults.ctl.card
+		}
+	}
+}
+
 ctl.hw {
 	@args[ CARD ]
 	@args.CARD {
@@ -308,25 +349,35 @@ ctl.shm {
 	ctl $CTL
 }
 
-ctl.default {
+#
+#  RawMidi interface
+#
+
+rawmidi.default {
 	type hw
 	card {
 		@func getenv
 		vars [
-			ALSA_CTL_CARD
+			ALSA_RAWMIDI_CARD
 			ALSA_CARD
 		]
 		default {
 			@func refer
-			name defaults.ctl.card
+			name defaults.rawmidi.card
+		}
+	}
+	device {
+		@func igetenv
+		vars [
+			ALSA_RAWMIDI_DEVICE
+		]
+		default {
+			@func refer
+			name defaults.rawmidi.device
 		}
 	}
 }
 
-#
-#  RawMidi interface
-#
-
 rawmidi.hw {
 	@args [ CARD DEV SUBDEV ]
 	@args.CARD {
@@ -370,31 +421,6 @@ rawmidi.hw {
 	}
 }
 
-rawmidi.default {
-	type hw
-	card {
-		@func getenv
-		vars [
-			ALSA_RAWMIDI_CARD
-			ALSA_CARD
-		]
-		default {
-			@func refer
-			name defaults.rawmidi.card
-		}
-	}
-	device {
-		@func igetenv
-		vars [
-			ALSA_RAWMIDI_DEVICE
-		]
-		default {
-			@func refer
-			name defaults.rawmidi.device
-		}
-	}
-}
-
 rawmidi.virtual {
 	@args [ MERGE ]
 	@args.MERGE {
@@ -421,6 +447,31 @@ seq.hw {
 #  HwDep interface
 #
 
+hwdep.default {
+	type hw
+	card {
+		@func getenv
+		vars [
+			ALSA_HWDEP_CARD
+			ALSA_CARD
+		]
+		default {
+			@func refer
+			name defaults.hwdep.card
+		}
+	}
+	device {
+		@func igetenv
+		vars [
+			ALSA_HWDEP_DEVICE
+		]
+		default {
+			@func refer
+			name defaults.hwdep.device
+		}
+	}
+}
+
 hwdep.hw {
 	@args [ CARD DEV ]
 	@args.CARD {
@@ -455,41 +506,41 @@ hwdep.hw {
 	device $DEV
 }
 
-hwdep.default {
-	type hw
-	card {
-		@func getenv
-		vars [
-			ALSA_HWDEP_CARD
-			ALSA_CARD
-		]
-		default {
-			@func refer
-			name defaults.hwdep.card
-		}
-	}
-	device {
-		@func igetenv
-		vars [
-			ALSA_HWDEP_DEVICE
-		]
-		default {
-			@func refer
-			name defaults.hwdep.device
-		}
-	}
-}
-
 #
 #  Timer interface
 #
 
+timer_query.default {
+	type hw
+}
+
 timer_query.hw {
 	type hw
 }
 
-timer_query.default {
+timer.default {
 	type hw
+	class {
+		@func refer
+		name defaults.timer.class
+	}
+	sclass {
+		@func refer
+		name defaults.timer.sclass
+	}
+	card {
+		@func refer
+		name defaults.timer.card
+	}
+	device {
+		@func refer
+		name defaults.timer.device
+	}
+	subdevice {
+		@func refer
+		name defaults.timer.subdevice
+	}
+	hint.description "Default direct hardware timer device"
 }
 
 timer.hw {
@@ -536,28 +587,3 @@ timer.hw {
 	device $DEV
 	subdevice $SUBDEV
 }
-
-timer.default {
-	type hw
-	class {
-		@func refer
-		name defaults.timer.class
-	}
-	sclass {
-		@func refer
-		name defaults.timer.sclass
-	}
-	card {
-		@func refer
-		name defaults.timer.card
-	}
-	device {
-		@func refer
-		name defaults.timer.device
-	}
-	subdevice {
-		@func refer
-		name defaults.timer.subdevice
-	}
-	hint.description "Default direct hardware timer device"
-}

src/conf/cards/HDA-Intel.conf

@@ -19,10 +19,7 @@ HDA-Intel.pcm.front.0 {
 		name "PCM Playback Volume"
 		card $CARD
 	}
-	hint {
-		description "Front speakers and multichannel output"
-		device 0
-	}
+	hint.device 0
 }	
 
 # default with dmix+softvol & dsnoop
@@ -54,7 +51,6 @@ HDA-Intel.pcm.default {
 		}
 	}
 	hint {
-		description "Default dmix+softvol + dsnoop device"
 		device_output {
 			@func refer
 			name defaults.pcm.dmix.device
@@ -140,10 +136,7 @@ HDA-Intel.pcm.iec958.0 {
 			]
 		}
 	}
-	hint {
-		description "IEC958 (S/PDIF) Output"
-		device 1
-	}
+	hint.device 1
 }
 
 <confdir:pcm/modem.conf>
@@ -156,5 +149,5 @@ HDA-Intel.pcm.modem.0 {
 	type hw
 	card $CARD
 	device 6
-	hint 0
+	hint.show off
 }

src/conf/pcm/center_lfe.conf

@@ -32,16 +32,26 @@ pcm.!center_lfe {
 			}
 		}
 	}
-	@func refer
-	name {
-		@func concat
-		strings [
-			"cards."
-			{
-				@func card_driver
-				card $CARD
-			}
-			".pcm.center_lfe." $DEV ":CARD=" $CARD
-		]
+	type empty
+	slave.pcm {
+		@func refer
+		name {
+			@func concat
+			strings [
+				"cards."
+				{
+					@func card_driver
+					card $CARD
+				}
+				".pcm.center_lfe." $DEV ":CARD=" $CARD
+			]
+		}
+	}
+	hint {
+		show {
+			@func refer
+			name defaults.namehint.basic
+		}
+		description "Center and Subwoofer speakers"
 	}
 }

src/conf/pcm/dmix.conf

@@ -12,14 +12,14 @@ pcm.!dmix {
 		}
 	}
 	@args.DEV {
-		type string
+		type integer
 		default {
 			@func refer
 			name defaults.pcm.dmix.device
 		}
 	}
 	@args.SUBDEV {
-		type string
+		type integer
 		default -1
 	}
 	@args.FORMAT {
@@ -120,6 +120,10 @@ pcm.!dmix {
 		}
 	}
 	hint {
+		show {
+			@func refer
+			name defaults.namehint.extended
+		}
 		description "Direct sample mixing device"
 		device $DEV
 	}

src/conf/pcm/dsnoop.conf

@@ -12,14 +12,14 @@ pcm.!dsnoop {
 		}
 	}
 	@args.DEV {
-		type string
+		type integer
 		default {
 			@func refer
 			name defaults.pcm.dsnoop.device
 		}
 	}
 	@args.SUBDEV {
-		type string
+		type integer
 		default -1
 	}
 	@args.FORMAT {
@@ -120,6 +120,10 @@ pcm.!dsnoop {
 		}
 	}
 	hint {
+		show {
+			@func refer
+			name defaults.namehint.extended
+		}
 		description "Direct sample snooping device"
 		device $DEV
 	}

src/conf/pcm/front.conf

@@ -32,16 +32,26 @@ pcm.!front {
 			}
 		}
 	}
-	@func refer
-	name {
-		@func concat
-		strings [
-			"cards."
-			{
-				@func card_driver
-				card $CARD
-			}
-			".pcm.front." $DEV ":CARD=" $CARD
-		]
+	type empty
+	slave.pcm {
+		@func refer
+		name {
+			@func concat
+			strings [
+				"cards."
+				{
+					@func card_driver
+					card $CARD
+				}
+				".pcm.front." $DEV ":CARD=" $CARD
+			]
+		}
+	}
+	hint {
+		show {
+			@func refer
+			name defaults.namehint.basic
+		}
+		description "Front speakers"
 	}
 }

src/conf/pcm/iec958.conf

@@ -52,21 +52,31 @@ pcm.!iec958 {
 		# fs=48000Hz, clock accuracy=1000ppm
 		default 0x02
 	}
-	@func refer
-	name {
-		@func concat
-		strings [
-			"cards."
-			{
-				@func card_driver
-				card $CARD
-			}
-			".pcm.iec958." $DEV ":"
-			"CARD=" $CARD ","
-			"AES0=" $AES0 ","
-			"AES1=" $AES1 ","
-			"AES2=" $AES2 ","
-			"AES3=" $AES3
-		]
+	type empty
+	slave.pcm {
+		@func refer
+		name {
+			@func concat
+			strings [
+				"cards."
+				{
+					@func card_driver
+					card $CARD
+				}
+				".pcm.iec958." $DEV ":"
+				"CARD=" $CARD ","
+				"AES0=" $AES0 ","
+				"AES1=" $AES1 ","
+				"AES2=" $AES2 ","
+				"AES3=" $AES3
+			]
+		}
+	}
+	hint {
+		show {
+			@func refer
+			name defaults.namehint.basic
+		}
+		description "IEC958 (S/PDIF) Digital Audio Output"
 	}
 }

src/conf/pcm/modem.conf

@@ -44,7 +44,7 @@ pcm.!phoneline {
 			".pcm.modem." $DEV ":CARD=" $CARD
 		]
 	}
-	hint 0
+	hint.show off
 }
 
 #
@@ -102,5 +102,5 @@ pcm.!modem {
 		}
 		]
 	}
-	hint 0
+	hint.show off
 }

src/conf/pcm/rear.conf

@@ -32,16 +32,26 @@ pcm.!rear {
 			}
 		}
 	}
-	@func refer
-	name {
-		@func concat
-		strings [
-			"cards."
-			{
-				@func card_driver
-				card $CARD
-			}
-			".pcm.rear." $DEV ":CARD=" $CARD
-		]
+	type empty
+	slave.pcm {
+		@func refer
+		name {
+			@func concat
+			strings [
+				"cards."
+				{
+					@func card_driver
+					card $CARD
+				}
+				".pcm.rear." $DEV ":CARD=" $CARD
+			]
+		}
+	}
+	hint {
+		show {
+			@func refer
+			name defaults.namehint.basic
+		}
+		description "Rear speakers"
 	}
 }

src/conf/pcm/side.conf

@@ -32,16 +32,26 @@ pcm.!side {
 			}
 		}
 	}
-	@func refer
-	name {
-		@func concat
-		strings [
-			"cards."
-			{
-				@func card_driver
-				card $CARD
-			}
-			".pcm.side." $DEV ":CARD=" $CARD
-		]
+	type empty
+	slave.pcm {
+		@func refer
+		name {
+			@func concat
+			strings [
+				"cards."
+				{
+					@func card_driver
+					card $CARD
+				}
+				".pcm.side." $DEV ":CARD=" $CARD
+			]
+		}
+	}
+	hint {
+		show {
+			@func refer
+			name defaults.namehint.basic
+		}
+		description "Side speakers"
 	}
 }

src/conf/pcm/surround40.conf

@@ -37,16 +37,20 @@ pcm.!surround40 {
 			}
 		}
 	}
-	@func refer
-	name {
-		@func concat
-		strings [
-			"cards."
-			{
-				@func card_driver
-				card $CARD
-			}
-			".pcm.surround40." $DEV ":CARD=" $CARD
-		]
+	type empty
+	slave.pcm {
+		@func refer
+		name {
+			@func concat
+			strings [
+				"cards."
+				{
+					@func card_driver
+					card $CARD
+				}
+				".pcm.surround40." $DEV ":CARD=" $CARD
+			]
+		}
 	}
+	hint.description "4.0 Surround output to Front and Rear speakers"
 }

src/conf/pcm/surround41.conf

@@ -59,4 +59,5 @@ pcm.!surround41 {
 	ttable.2.2 1
 	ttable.3.3 1
 	ttable.4.5 1
+	hint.description "4.1 Surround output to Front, Rear and Subwoofer speakers"
 }

src/conf/pcm/surround50.conf

@@ -59,4 +59,5 @@ pcm.!surround50 {
 	ttable.2.2 1
 	ttable.3.3 1
 	ttable.4.4 1
+	hint.description "5.0 Surround output to Front, Center and Rear speakers"
 }

src/conf/pcm/surround51.conf

@@ -39,16 +39,20 @@ pcm.!surround51 {
 			}
 		}
 	}
-	@func refer
-	name {
-		@func concat
-		strings [
-			"cards."
-			{
-				@func card_driver
-				card $CARD
-			}
-			".pcm.surround51." $DEV ":CARD=" $CARD
-		]
+	type empty
+	slave.pcm {
+		@func refer
+		name {
+			@func concat
+			strings [
+				"cards."
+				{
+					@func card_driver
+					card $CARD
+				}
+				".pcm.surround51." $DEV ":CARD=" $CARD
+			]
+		}
 	}
+	hint.description "5.1 Surround output to Front, Center, Rear and Subwoofer speakers"
 }

src/conf/pcm/surround71.conf

@@ -41,16 +41,20 @@ pcm.!surround71 {
 			}
 		}
 	}
-	@func refer
-	name {
-		@func concat
-		strings [
-			"cards."
-			{
-				@func card_driver
-				card $CARD
-			}
-			".pcm.surround71." $DEV ":CARD=" $CARD
-		]
+	type empty
+	slave.pcm {
+		@func refer
+		name {
+			@func concat
+			strings [
+				"cards."
+				{
+					@func card_driver
+					card $CARD
+				}
+				".pcm.surround71." $DEV ":CARD=" $CARD
+			]
+		}
 	}
+	hint.description "7.1 Surround output to Front, Center, Side, Rear and Woofer speakers"
 }