From: Takashi Sakamoto Date: Sun, 14 Jun 2020 12:23:36 +0000 (+0900) Subject: rawmidi: substream_status: use uint64_t for avail and xrun properties X-Git-Tag: v0.1.0~49 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=ba568d8bfa649822c0dcec2def6d5e5266b8f9da;p=alsa-gobject.git rawmidi: substream_status: use uint64_t for avail and xrun properties The avail and xrun members in struct snd_rawmidi_params are defined as size_t type. The size_t is long type, thus the size is different between 32 bit ABI and 64 bit ABI. This commit uses uint64_t type for the properties so that the size is the same as these two ABIs. Fixes: 2371b927816d ("rawmidi: substream_status: add properties") Signed-off-by: Takashi Sakamoto --- diff --git a/src/rawmidi/substream-status.c b/src/rawmidi/substream-status.c index 6dca740..a766517 100644 --- a/src/rawmidi/substream-status.c +++ b/src/rawmidi/substream-status.c @@ -34,10 +34,10 @@ static void rawmidi_substream_status_get_property(GObject *obj, guint id, switch (id) { case RAWMIDI_SUBSTREAM_STATUS_PROP_AVAIL: - g_value_set_long(val, priv->status.avail); + g_value_set_uint64(val, priv->status.avail); break; case RAWMIDI_SUBSTREAM_STATUS_PROP_XRUN: - g_value_set_long(val, priv->status.xruns); + g_value_set_uint64(val, priv->status.xruns); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, id, spec); @@ -52,18 +52,18 @@ static void alsarawmidi_substream_status_class_init(ALSARawmidiSubstreamStatusCl gobject_class->get_property = rawmidi_substream_status_get_property; rawmidi_substream_status_props[RAWMIDI_SUBSTREAM_STATUS_PROP_AVAIL] = - g_param_spec_ulong("avail", "avail", - "The size of available space in intermediate buffer.", - 0, G_MAXULONG, - 0, - G_PARAM_READABLE); + g_param_spec_uint64("avail", "avail", + "The size of available space in intermediate buffer.", + 0, G_MAXUINT64, + 0, + G_PARAM_READABLE); rawmidi_substream_status_props[RAWMIDI_SUBSTREAM_STATUS_PROP_XRUN] = - g_param_spec_ulong("xruns", "xruns", - "The count of XRUNs since the last query of status.", - 0, G_MAXULONG, - 0, - G_PARAM_READABLE); + g_param_spec_uint64("xruns", "xruns", + "The count of XRUNs since the last query of status.", + 0, G_MAXUINT64, + 0, + G_PARAM_READABLE); g_object_class_install_properties(gobject_class, RAWMIDI_SUBSTREAM_STATUS_PROP_COUNT,