rawmidi: fix argument names with suffix '_id'

According to the convention in this project.

Fixes: 55f796b5ad33 ("rawmidi: add global method to get list of directional subdevices for rawmidi device")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

diff --git a/src/rawmidi/query.c b/src/rawmidi/query.c
index 0d3d683d6f8f8b5f10414494b3424d5b82a73ce2..2f40f8e2613a4a10425860ec7fdccf014de35789 100644 (file)
--- a/src/rawmidi/query.c
+++ b/src/rawmidi/query.c
@@ -363,8 +363,8 @@ err_sysname:
 
 /**
  * alsarawmidi_get_subdevice_id_list:
- * @card: The numberical value for sound card to query.
- * @device: The numerical value of rawmidi device to query.
+ * @card_id: The numberical value for sound card to query.
+ * @device_id: The numerical value of rawmidi device to query.
  * @direction: The direction of stream to query, one of
  *             ALSARawmidiStreamDirection.
  * @entries: (array length=entry_count)(out): The list of card.
@@ -377,14 +377,14 @@ err_sysname:
  * The call of function executes open(2), close(2), and ioctl(2) system call
  * with SNDRV_CTL_IOCTL_RAWMIDI_INFO command for ALSA control character device.
  */
-void alsarawmidi_get_subdevice_id_list(guint card, guint device,
+void alsarawmidi_get_subdevice_id_list(guint card_id, guint device_id,
                                        ALSARawmidiStreamDirection direction,
                                        guint **entries, gsize *entry_count,
                                        GError **error)
 {
     struct snd_rawmidi_info info = {
-        .card = card,
-        .device = device,
+        .card = card_id,
+        .device = device_id,
         .stream = direction,
         .subdevice = 0,
     };
@@ -394,7 +394,7 @@ void alsarawmidi_get_subdevice_id_list(guint card, guint device,
     g_return_if_fail(entry_count != NULL);
     g_return_if_fail(error == NULL || *error == NULL);
 
-    rawmidi_perform_ctl_ioctl(card, SNDRV_CTL_IOCTL_RAWMIDI_INFO, &info, "RAWMIDI_INFO", NULL, error);
+    rawmidi_perform_ctl_ioctl(card_id, SNDRV_CTL_IOCTL_RAWMIDI_INFO, &info, "RAWMIDI_INFO", NULL, error);
     if (*error != NULL)
         return;
 

diff --git a/src/rawmidi/query.h b/src/rawmidi/query.h
index a6888335cd3ab88e7d8027395e84441224655e8a..c7db2216f6bade105da752605c0e494cb536a045 100644 (file)
--- a/src/rawmidi/query.h
+++ b/src/rawmidi/query.h
@@ -16,7 +16,7 @@ void alsarawmidi_get_rawmidi_sysname(guint card_id, guint device_id,
 void alsarawmidi_get_rawmidi_devnode(guint card_id, guint device_id,
                                      char **devnode, GError **error);
 
-void alsarawmidi_get_subdevice_id_list(guint card, guint device,
+void alsarawmidi_get_subdevice_id_list(guint card_id, guint device_id,
                                        ALSARawmidiStreamDirection direction,
                                        guint **entries, gsize *entry_count,
                                        GError **error);