From cab8fb4149892eb1bfb1be457f88d1cb8613759e Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sat, 4 Apr 2020 12:41:28 +0900 Subject: [PATCH] seq: event_fixed: change function signature to return nothing The alsa-gobject project has a loose convention to have functions returning nothing. 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 --- src/seq/event-fixed.c | 25 +++++++++++++------------ src/seq/event-fixed.h | 6 ++++-- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/seq/event-fixed.c b/src/seq/event-fixed.c index 9fbee16..973f5bc 100644 --- a/src/seq/event-fixed.c +++ b/src/seq/event-fixed.c @@ -216,22 +216,22 @@ ALSASeqEventFixed *alsaseq_event_fixed_new(ALSASeqEventType event_type, /** * alsaseq_event_fixed_get_byte_data: * @self: A #ALSASeqEventFixed. + * @bytes: (array fixed-size=12)(out)(transfer none): The 12 byte data for the + * event. The lifetime of the object is the same as the event itself. * * Refer to the 12 byte data for the event. - * - * Returns: (array fixed-size=12)(transfer none): The 12 byte data for the - * event. The lifetime of the object is the same as the event itself. */ -const guint8 *alsaseq_event_fixed_get_byte_data(ALSASeqEventFixed *self) +void alsaseq_event_fixed_get_byte_data(ALSASeqEventFixed *self, + const guint8 **bytes) { ALSASeqEvent *parent; struct snd_seq_event *ev; - g_return_val_if_fail(ALSASEQ_IS_EVENT_FIXED(self), NULL); + g_return_if_fail(ALSASEQ_IS_EVENT_FIXED(self)); parent = ALSASEQ_EVENT(self); seq_event_refer_private(parent, &ev); - return ev->data.raw8.d; + *bytes = ev->data.raw8.d; } /** @@ -257,22 +257,23 @@ void alsaseq_event_fixed_set_byte_data(ALSASeqEventFixed *self, /** * alsaseq_event_fixed_get_quadlet_data: * @self: A #ALSASeqEventFixed. + * @quadlets: (array fixed-size=3)(out)(transfer none): The 3 quadlet data for + * the event. The lifetime of the object is the same as the event + * itself. * * Get the 3 quadlet data for the event. - * - * Returns: (array fixed-size=3)(transfer none): The 3 quadlet data for the - * event. The lifetime of the object is the same as the event itself. */ -const guint32 *alsaseq_event_fixed_get_quadlet_data(ALSASeqEventFixed *self) +void alsaseq_event_fixed_get_quadlet_data(ALSASeqEventFixed *self, + const guint32 **quadlets) { ALSASeqEvent *parent; struct snd_seq_event *ev; - g_return_val_if_fail(ALSASEQ_IS_EVENT_FIXED(self), NULL); + g_return_if_fail(ALSASEQ_IS_EVENT_FIXED(self)); parent = ALSASEQ_EVENT(self); seq_event_refer_private(parent, &ev); - return ev->data.raw32.d; + *quadlets = ev->data.raw32.d; } /** diff --git a/src/seq/event-fixed.h b/src/seq/event-fixed.h index ebe6e94..96e73d7 100644 --- a/src/seq/event-fixed.h +++ b/src/seq/event-fixed.h @@ -52,11 +52,13 @@ GType alsaseq_event_fixed_get_type() G_GNUC_CONST; ALSASeqEventFixed *alsaseq_event_fixed_new(ALSASeqEventType event_type, GError **error); -const guint8 *alsaseq_event_fixed_get_byte_data(ALSASeqEventFixed *self); +void alsaseq_event_fixed_get_byte_data(ALSASeqEventFixed *self, + const guint8 **bytes); void alsaseq_event_fixed_set_byte_data(ALSASeqEventFixed *self, const guint8 bytes[12]); -const guint32 *alsaseq_event_fixed_get_quadlet_data(ALSASeqEventFixed *self); +void alsaseq_event_fixed_get_quadlet_data(ALSASeqEventFixed *self, + const guint32 **quadlets); void alsaseq_event_fixed_set_quadlet_data(ALSASeqEventFixed *self, const guint32 quadlets[3]); -- 2.47.3