[alsa-devel] SALSA Lib - TLV Deprecated warnings

[J. Scott Merritt]

On Tue, 09 Oct 2007 11:05:03 +0200
Takashi Iwai <tiwai at suse.de> wrote:

> At Sun, 30 Sep 2007 11:10:58 -0400,
> J. Scott Merritt wrote:
> > 
> > It appears that if SALSA Lib 0.0.12 is built -without- TLV enabled in
> > the configuration options, then simply -including- asoundlib.h from an
> > application program will trigger deprecated warnings on some of the
> > TLV read/write function definitions (even though they are not called
> > from the application).
> > 
> > Is there something we can do to the header files to eliminate these
> > warnings ?
> 
> Try to build with --disable-deprecated option.  See GENERAL:MISC
> section in README.

How about the following patch to SALSA Lib 0.0.12 to eliminate
the warnings if TLV is not enabled ?   ...   Thanks, Scott.

--- a/src/hctl_macros.h	2007-08-29 12:05:25.000000000 -0400
+++ b/src/hctl_macros.h	2007-10-21 12:54:28.000000000 -0400
@@ -129,6 +129,7 @@
 	return snd_ctl_elem_write(elem->hctl->ctl, value);
 }
 
+#if SALSA_HAS_TLV_SUPPORT
 static inline
 int snd_hctl_elem_tlv_read(snd_hctl_elem_t *elem, unsigned int *tlv,
 			   unsigned int tlv_size)
@@ -148,6 +149,28 @@
 	return snd_ctl_elem_tlv_command(elem->hctl->ctl, &elem->id, tlv);
 }
 
+#else /* SALSA_HAS_TLV_SUPPORT */
+
+static inline __SALSA_NOT_IMPLEMENTED
+int snd_hctl_elem_tlv_read(snd_hctl_elem_t *elem, unsigned int *tlv,
+			   unsigned int tlv_size)
+{
+	return -ENXIO;
+}
+
+static inline __SALSA_NOT_IMPLEMENTED
+int snd_hctl_elem_tlv_write(snd_hctl_elem_t *elem, const unsigned int *tlv)
+{
+	return -ENXIO;
+}
+
+static inline __SALSA_NOT_IMPLEMENTED
+int snd_hctl_elem_tlv_command(snd_hctl_elem_t *elem, const unsigned int *tlv)
+{
+	return -ENXIO;
+}
+#endif /* SALSA_HAS_TLV_SUPPORT */
+
 static inline
 snd_hctl_t *snd_hctl_elem_get_hctl(snd_hctl_elem_t *elem)
 {