Skip to content

Commit

Permalink
rawmidi: ump - fix snd_ump_block_info_set_block_id double version
Browse files Browse the repository at this point in the history
Fix mistake snd_ump_block_info_get_block_id / snd_ump_block_info_set_block_id .

Fixes: 76d2d28 ("rawmidi: ump - fix snd_ump_block_info_get_block_id double version")
Link: #422
Signed-off-by: Jaroslav Kysela <[email protected]>
  • Loading branch information
perexg committed Nov 25, 2024
1 parent 76d2d28 commit 352cbc5
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions src/rawmidi/ump.c
Original file line number Diff line number Diff line change
Expand Up @@ -750,20 +750,11 @@ int snd_ump_block_info_get_device(const snd_ump_block_info_t *info)
* \param info pointer to a snd_ump_block_info_t structure
* \return ID number of the given UMP block
*/
#ifndef DOXYGEN
EXPORT_SYMBOL unsigned int INTERNAL(snd_ump_block_info_get_block_id)(const snd_ump_block_info_t *info)
#else
unsigned int snd_ump_block_info_get_block_id(const snd_ump_block_info_t *info)
#endif
{
return info->block_id;
}

#ifndef DOC_HIDDEN
use_symbol_version(__snd_ump_block_info_get_block_id, snd_ump_block_info_get_block_id, ALSA_1.2.10);
use_default_symbol_version(__snd_ump_block_info_get_block_id, snd_ump_block_info_get_block_id, ALSA_1.2.13);
#endif /* DOC_HIDDEN */

/**
* \brief get UMP block activeness
* \param info pointer to a snd_ump_block_info_t structure
Expand Down Expand Up @@ -881,12 +872,22 @@ void snd_ump_block_info_set_device(snd_ump_block_info_t *info, unsigned int devi
*
* This function is mostly used for setting the block ID to query.
*/
#ifndef DOXYGEN
EXPORT_SYMBOL void INTERNAL(snd_ump_block_info_set_block_id)(snd_ump_block_info_t *info,
unsigned int id)
#else
void snd_ump_block_info_set_block_id(snd_ump_block_info_t *info,
unsigned int id)
#endif
{
info->block_id = id;
}

#ifndef DOC_HIDDEN
use_symbol_version(__snd_ump_block_info_set_block_id, snd_ump_block_info_set_block_id, ALSA_1.2.10);
use_default_symbol_version(__snd_ump_block_info_set_block_id, snd_ump_block_info_set_block_id, ALSA_1.2.13);
#endif /* DOC_HIDDEN */

/**
* \brief set activeness to snd_ump_block_info_t structure
* \param info pointer to a snd_ump_block_info_t structure
Expand Down

0 comments on commit 352cbc5

Please sign in to comment.