seq: event_fixed: change parameter names for byte and quadlet data

The getter/setter for byte and quadlet data has argument named as 'data'.
For this case, the alsa-gobject project has a loose convention to name them
as 'bytes' and 'quadlets'. This commit renames the arguments.

Fixes: 641f317f04b3 ("seq: event_fixed: add API to refer to byte data of event")
Fixes: 1b71f2015d06: ("seq: event_fixed: add API to refer to quadlet data of event")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

diff --git a/src/seq/event-fixed.c b/src/seq/event-fixed.c
index 0487cc36beee00acf36d10fcffcb44abf024b566..9fbee1657ec236951e7e9b505aa2f545f614c20d 100644 (file)
--- a/src/seq/event-fixed.c
+++ b/src/seq/event-fixed.c
@@ -237,12 +237,12 @@ const guint8 *alsaseq_event_fixed_get_byte_data(ALSASeqEventFixed *self)
 /**
  * alsaseq_event_fixed_set_byte_data:
  * @self: A #ALSASeqEventFixed.
- * @data: (array fixed-size=12)(transfer none): The 12 byte data for the event.
+ * @bytes: (array fixed-size=12)(transfer none): The 12 byte data for the event.
  *
  * Copy the 12 byte data for the event.
  */
 void alsaseq_event_fixed_set_byte_data(ALSASeqEventFixed *self,
-                                       const guint8 data[12])
+                                       const guint8 bytes[12])
 {
     ALSASeqEvent *parent;
     struct snd_seq_event *ev;
@@ -251,7 +251,7 @@ void alsaseq_event_fixed_set_byte_data(ALSASeqEventFixed *self,
     parent = ALSASEQ_EVENT(self);
     seq_event_refer_private(parent, &ev);
 
-    memcpy(ev->data.raw8.d, data, sizeof(ev->data.raw8.d));
+    memcpy(ev->data.raw8.d, bytes, sizeof(ev->data.raw8.d));
 }
 
 /**
@@ -278,12 +278,13 @@ const guint32 *alsaseq_event_fixed_get_quadlet_data(ALSASeqEventFixed *self)
 /**
  * alsaseq_event_fixed_set_quadlet_data:
  * @self: A #ALSASeqEventFixed.
- * @data: (array fixed-size=3)(transfer none): The 3 quadlet data for the event.
+ * @quadlets: (array fixed-size=3)(transfer none): The 3 quadlet data for the
+ *            event.
  *
  * Copy the 3 quadlet data for the event.
  */
 void alsaseq_event_fixed_set_quadlet_data(ALSASeqEventFixed *self,
-                                          const guint32 data[3])
+                                          const guint32 quadlets[3])
 {
     ALSASeqEvent *parent;
     struct snd_seq_event *ev;
@@ -292,5 +293,5 @@ void alsaseq_event_fixed_set_quadlet_data(ALSASeqEventFixed *self,
     parent = ALSASEQ_EVENT(self);
     seq_event_refer_private(parent, &ev);
 
-    memcpy(ev->data.raw32.d, data, sizeof(ev->data.raw32.d));
+    memcpy(ev->data.raw32.d, quadlets, sizeof(ev->data.raw32.d));
 }

diff --git a/src/seq/event-fixed.h b/src/seq/event-fixed.h
index 97cd6df6e9dff3521fa95e8aa838c4a95081c0e5..ebe6e9499611a4554bc96fef4818439003a6b7b4 100644 (file)
--- a/src/seq/event-fixed.h
+++ b/src/seq/event-fixed.h
@@ -54,11 +54,11 @@ ALSASeqEventFixed *alsaseq_event_fixed_new(ALSASeqEventType event_type,
 
 const guint8 *alsaseq_event_fixed_get_byte_data(ALSASeqEventFixed *self);
 void alsaseq_event_fixed_set_byte_data(ALSASeqEventFixed *self,
-                                       const guint8 data[12]);
+                                       const guint8 bytes[12]);
 
 const guint32 *alsaseq_event_fixed_get_quadlet_data(ALSASeqEventFixed *self);
 void alsaseq_event_fixed_set_quadlet_data(ALSASeqEventFixed *self,
-                                          const guint32 data[3]);
+                                          const guint32 quadlets[3]);
 
 G_END_DECLS