From 3d6f95771ea221ad54a4b0d760811c92db03c0ec Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Fri, 3 Jun 2022 12:36:48 +0900 Subject: [PATCH] hwdep: use explicit value for iface type enumeration Current definition for iface type enumeration uses conditional macro. It brings gir parser warnings. This commit uses explicit value for them. Signed-off-by: Takashi Sakamoto --- src/hwdep/alsahwdep-enum-types.h | 67 +++++++++++++------------------- 1 file changed, 27 insertions(+), 40 deletions(-) diff --git a/src/hwdep/alsahwdep-enum-types.h b/src/hwdep/alsahwdep-enum-types.h index 3c4f483..a8c84d0 100644 --- a/src/hwdep/alsahwdep-enum-types.h +++ b/src/hwdep/alsahwdep-enum-types.h @@ -6,19 +6,6 @@ G_BEGIN_DECLS -#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. @@ -52,33 +39,33 @@ G_BEGIN_DECLS * A set of enumerations for the interface of hwdep device. */ typedef enum { - ALSAHWDEP_IFACE_TYPE_OPL2 = SNDRV_HWDEP_IFACE_OPL2, - ALSAHWDEP_IFACE_TYPE_OPL3 = SNDRV_HWDEP_IFACE_OPL3, - ALSAHWDEP_IFACE_TYPE_OPL4 = SNDRV_HWDEP_IFACE_OPL4, - ALSAHWDEP_IFACE_TYPE_SB16CSP = SNDRV_HWDEP_IFACE_SB16CSP, - ALSAHWDEP_IFACE_TYPE_EMU10K1 = SNDRV_HWDEP_IFACE_EMU10K1, - ALSAHWDEP_IFACE_TYPE_YSS225 = SNDRV_HWDEP_IFACE_YSS225, - ALSAHWDEP_IFACE_TYPE_ICS2115 = SNDRV_HWDEP_IFACE_ICS2115, - ALSAHWDEP_IFACE_TYPE_SSCAPE = SNDRV_HWDEP_IFACE_SSCAPE, - ALSAHWDEP_IFACE_TYPE_VX = SNDRV_HWDEP_IFACE_VX, - ALSAHWDEP_IFACE_TYPE_MIXART = SNDRV_HWDEP_IFACE_MIXART, - ALSAHWDEP_IFACE_TYPE_USX2Y = SNDRV_HWDEP_IFACE_USX2Y, - ALSAHWDEP_IFACE_TYPE_EMUX_WAVETABLE = SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, - ALSAHWDEP_IFACE_TYPE_BLUETOOTH = SNDRV_HWDEP_IFACE_BLUETOOTH, - ALSAHWDEP_IFACE_TYPE_USX2Y_PCM = SNDRV_HWDEP_IFACE_USX2Y_PCM, - ALSAHWDEP_IFACE_TYPE_PCXHR = SNDRV_HWDEP_IFACE_PCXHR, - ALSAHWDEP_IFACE_TYPE_SB_RC = SNDRV_HWDEP_IFACE_SB_RC, - ALSAHWDEP_IFACE_TYPE_HDA = SNDRV_HWDEP_IFACE_HDA, - ALSAHWDEP_IFACE_TYPE_USB_STREAM = SNDRV_HWDEP_IFACE_USB_STREAM, - ALSAHWDEP_IFACE_TYPE_FW_DICE = SNDRV_HWDEP_IFACE_FW_DICE, - ALSAHWDEP_IFACE_TYPE_FW_FIREWORKS = SNDRV_HWDEP_IFACE_FW_FIREWORKS, - ALSAHWDEP_IFACE_TYPE_FW_BEBOB = SNDRV_HWDEP_IFACE_FW_BEBOB, - 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, - ALSAHWDEP_IFACE_TYPE_LINE6 = SNDRV_HWDEP_IFACE_LINE6, - ALSAHWDEP_IFACE_TYPE_FW_MOTU = SNDRV_HWDEP_IFACE_FW_MOTU, - ALSAHWDEP_IFACE_TYPE_FW_FIREFACE = SNDRV_HWDEP_IFACE_FW_FIREFACE, + ALSAHWDEP_IFACE_TYPE_OPL2 = 0, + ALSAHWDEP_IFACE_TYPE_OPL3, + ALSAHWDEP_IFACE_TYPE_OPL4, + ALSAHWDEP_IFACE_TYPE_SB16CSP, + ALSAHWDEP_IFACE_TYPE_EMU10K1, + ALSAHWDEP_IFACE_TYPE_YSS225, + ALSAHWDEP_IFACE_TYPE_ICS2115, + ALSAHWDEP_IFACE_TYPE_SSCAPE, + ALSAHWDEP_IFACE_TYPE_VX, + ALSAHWDEP_IFACE_TYPE_MIXART, + ALSAHWDEP_IFACE_TYPE_USX2Y, + ALSAHWDEP_IFACE_TYPE_EMUX_WAVETABLE, + ALSAHWDEP_IFACE_TYPE_BLUETOOTH, + ALSAHWDEP_IFACE_TYPE_USX2Y_PCM, + ALSAHWDEP_IFACE_TYPE_PCXHR, + ALSAHWDEP_IFACE_TYPE_SB_RC, + ALSAHWDEP_IFACE_TYPE_HDA, + ALSAHWDEP_IFACE_TYPE_USB_STREAM, + ALSAHWDEP_IFACE_TYPE_FW_DICE, + ALSAHWDEP_IFACE_TYPE_FW_FIREWORKS, + ALSAHWDEP_IFACE_TYPE_FW_BEBOB, + ALSAHWDEP_IFACE_TYPE_FW_OXFW, + ALSAHWDEP_IFACE_TYPE_FW_DIGI00X, + ALSAHWDEP_IFACE_TYPE_FW_TASCAM, + ALSAHWDEP_IFACE_TYPE_LINE6, + ALSAHWDEP_IFACE_TYPE_FW_MOTU, + ALSAHWDEP_IFACE_TYPE_FW_FIREFACE, } ALSAHwdepIfaceType; G_END_DECLS -- 2.47.3