From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Date: Fri, 20 Nov 2020 07:41:36 +0000 (+0900)
Subject: hwdep: fix metadata and documentation for the type of interface
X-Git-Tag: v0.2.0~3
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=c23ed9ba5dc2cac26d733fe9aecfee86fe94e1c1;p=alsa-gobject.git

hwdep: fix metadata and documentation for the type of interface

The scanner of g-i and gtk-doc can't handle macro lines in enumeration
lines expectedly.

This commit fixes to generate valid metadata and documentation.

Fixes: 843c9fe68228 ("hwdep: conditional build for Linux kernel 4.12 or later")
Fixes: 45f650bf29e8 ("hwdep: conditional build for Linux kernel v4.9 or later")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---

diff --git a/src/hwdep/alsahwdep-enum-types.h b/src/hwdep/alsahwdep-enum-types.h
index 97278f7..b511666 100644
--- a/src/hwdep/alsahwdep-enum-types.h
+++ b/src/hwdep/alsahwdep-enum-types.h
@@ -5,6 +5,19 @@
 #include <sound/asound.h>
 #include <linux/version.h>
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,9,0)
+#ifndef __GTK_DOC_IGNORE__
+#define SNDRV_HWDEP_IFACE_LINE6         (SNDRV_HWDEP_IFACE_FW_TASCAM + 1)
+#endif
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)
+#ifndef __GTK_DOC_IGNORE__
+#define SNDRV_HWDEP_IFACE_FW_MOTU       (SNDRV_HWDEP_IFACE_LINE6 + 1)
+#define SNDRV_HWDEP_IFACE_FW_FIREFACE   (SNDRV_HWDEP_IFACE_FW_MOTU + 1)
+#endif
+#endif
+
 /**
  *ALSAHwdepIfaceType:
  * @ALSAHWDEP_IFACE_TYPE_OPL2:              For OPL2 sound chip.
@@ -62,18 +75,9 @@ typedef enum {
     ALSAHWDEP_IFACE_TYPE_FW_OXFW        = SNDRV_HWDEP_IFACE_FW_OXFW,
     ALSAHWDEP_IFACE_TYPE_FW_DIGI00X     = SNDRV_HWDEP_IFACE_FW_DIGI00X,
     ALSAHWDEP_IFACE_TYPE_FW_TASCAM      = SNDRV_HWDEP_IFACE_FW_TASCAM,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0)
     ALSAHWDEP_IFACE_TYPE_LINE6          = SNDRV_HWDEP_IFACE_LINE6,
-#else
-    ALSAHWDEP_IFACE_TYPE_LINE6,
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
     ALSAHWDEP_IFACE_TYPE_FW_MOTU        = SNDRV_HWDEP_IFACE_FW_MOTU,
     ALSAHWDEP_IFACE_TYPE_FW_FIREFACE    = SNDRV_HWDEP_IFACE_FW_FIREFACE,
-#else
-    ALSAHWDEP_IFACE_TYPE_FW_MOTU,
-    ALSAHWDEP_IFACE_TYPE_FW_FIREFACE,
-#endif
 } ALSAHwdepIfaceType;
 
 #endif