seq: use guint8 for the numerical ID of queue

diff --git a/src/seq/query.c b/src/seq/query.c
index 8a076b9ccb68b3235658330e331732bdf2c0fed3..95a4d58840b3ebb48624567b674e0c02bcaa10a8 100644 (file)
--- a/src/seq/query.c
+++ b/src/seq/query.c
@@ -646,7 +646,7 @@ void alsaseq_get_queue_id_list(guint **entries, gsize *entry_count,
  * with SNDRV_SEQ_IOCTL_GET_QUEUE_INFO command for ALSA sequencer character
  * device.
  */
-void alsaseq_get_queue_info_by_id(guint queue_id, ALSASeqQueueInfo **queue_info,
+void alsaseq_get_queue_info_by_id(guint8 queue_id, ALSASeqQueueInfo **queue_info,
                                   GError **error)
 {
     struct snd_seq_queue_info *info;
@@ -736,7 +736,7 @@ void alsaseq_get_queue_info_by_name(const gchar *name,
  * with SNDRV_SEQ_IOCTL_GET_QUEUE_STATUS command for ALSA sequencer character
  * device.
  */
-void alsaseq_get_queue_status(guint queue_id,
+void alsaseq_get_queue_status(guint8 queue_id,
                               ALSASeqQueueStatus *const *queue_status,
                               GError **error)
 {

diff --git a/src/seq/query.h b/src/seq/query.h
index eb4ce0d339eab704c8bcc0aafb501b889d9fc351..57d2a549a1e7d1708435677ba7411350bee58874 100644 (file)
--- a/src/seq/query.h
+++ b/src/seq/query.h
@@ -43,13 +43,13 @@ void alsaseq_get_subscription_list(const ALSASeqAddr *addr,
 void alsaseq_get_queue_id_list(guint **entries, gsize *entry_count,
                                GError **error);
 
-void alsaseq_get_queue_info_by_id(guint queue_id, ALSASeqQueueInfo **queue_info,
+void alsaseq_get_queue_info_by_id(guint8 queue_id, ALSASeqQueueInfo **queue_info,
                                   GError **error);
 void alsaseq_get_queue_info_by_name(const gchar *name,
                                     ALSASeqQueueInfo **queue_info,
                                     GError **error);
 
-void alsaseq_get_queue_status(guint queue_id,
+void alsaseq_get_queue_status(guint8 queue_id,
                               ALSASeqQueueStatus *const *queue_status,
                               GError **error);
 

diff --git a/src/seq/queue-info.c b/src/seq/queue-info.c
index c7f0dc892aac572dc770f817972f66fbb737d6d7..57375d6b57c534183d17597968c38faad4aead66 100644 (file)
--- a/src/seq/queue-info.c
+++ b/src/seq/queue-info.c
@@ -38,7 +38,7 @@ static void seq_queue_info_set_property(GObject *obj, guint id,
 
     switch (id) {
     case SEQ_QUEUE_INFO_PROP_QUEUE_ID:
-        priv->info.queue = g_value_get_int(val);
+        priv->info.queue = (int)g_value_get_uchar(val);
         break;
     case SEQ_QUEUE_INFO_PROP_CLIENT_ID:
         priv->info.owner = g_value_get_int(val);
@@ -64,7 +64,7 @@ static void seq_queue_info_get_property(GObject *obj, guint id, GValue *val,
 
     switch (id) {
     case SEQ_QUEUE_INFO_PROP_QUEUE_ID:
-        g_value_set_int(val, priv->info.queue);
+        g_value_set_uchar(val, (guint8)priv->info.queue);
         break;
     case SEQ_QUEUE_INFO_PROP_CLIENT_ID:
         g_value_set_int(val, priv->info.owner);
@@ -89,12 +89,12 @@ static void alsaseq_queue_info_class_init(ALSASeqQueueInfoClass *klass)
     gobject_class->get_property = seq_queue_info_get_property;
 
     seq_queue_info_props[SEQ_QUEUE_INFO_PROP_QUEUE_ID] =
-        g_param_spec_int("queue-id", "queue-id",
-                         "The numerical ID of queue, except for one of "
-                         "ALSASeqSpecificClientId.",
-                         G_MININT, G_MAXINT,
-                         -1,
-                         G_PARAM_READWRITE);
+        g_param_spec_uchar("queue-id", "queue-id",
+                           "The numerical ID of queue, except for one of "
+                           "ALSASeqSpecificClientId.",
+                           0, G_MAXUINT8,
+                           0,
+                           G_PARAM_READWRITE);
 
     seq_queue_info_props[SEQ_QUEUE_INFO_PROP_CLIENT_ID] =
         g_param_spec_int("client-id", "client-id",

diff --git a/src/seq/queue-status.c b/src/seq/queue-status.c
index 158b5871a1ee0bcb9f9a8b848dd661172378095d..92222a2e53968a027585e0c20a8d1594e59a261d 100644 (file)
--- a/src/seq/queue-status.c
+++ b/src/seq/queue-status.c
@@ -55,12 +55,12 @@ static void alsaseq_queue_status_class_init(ALSASeqQueueStatusClass *klass)
     gobject_class->get_property = seq_queue_status_get_property;
 
     seq_queue_status_props[SEQ_QUEUE_STATUS_PROP_QUEUE_ID] =
-        g_param_spec_int("queue-id", "queue-id",
-                         "The numerical ID of queue, except for entries in "
-                         "ALSASeqSpecificQueueId.",
-                         G_MININT, G_MAXINT,
-                         -1,
-                         G_PARAM_READABLE);
+        g_param_spec_uchar("queue-id", "queue-id",
+                           "The numerical ID of queue, except for entries in "
+                           "ALSASeqSpecificQueueId.",
+                           0, G_MAXUINT8,
+                           0,
+                           G_PARAM_READABLE);
 
     seq_queue_status_props[SEQ_QUEUE_STATUS_PROP_EVENT_COUNT] =
         g_param_spec_int("event-count", "event-count",

diff --git a/src/seq/queue-tempo.c b/src/seq/queue-tempo.c
index 54b1c33804f57a19aa98d4f7c56381f048990830..58c70b5500caaff4b67fb9d231a36826873478e6 100644 (file)
--- a/src/seq/queue-tempo.c
+++ b/src/seq/queue-tempo.c
@@ -33,7 +33,7 @@ static void seq_queue_tempo_set_property(GObject *obj, guint id,
 
     switch (id) {
     case SEQ_QUEUE_TEMPO_PROP_QUEUE_ID:
-        priv->tempo.queue = g_value_get_int(val);
+        priv->tempo.queue = (int)g_value_get_uchar(val);
         break;
     case SEQ_QUEUE_TEMPO_PROP_TEMPO:
         priv->tempo.tempo = g_value_get_int(val);
@@ -56,7 +56,7 @@ static void seq_queue_tempo_get_property(GObject *obj, guint id, GValue *val,
 
     switch (id) {
     case SEQ_QUEUE_TEMPO_PROP_QUEUE_ID:
-        g_value_set_int(val, priv->tempo.queue);
+        g_value_set_uchar(val, (guint8)priv->tempo.queue);
         break;
     case SEQ_QUEUE_TEMPO_PROP_TEMPO:
         g_value_set_uint(val, priv->tempo.tempo);
@@ -78,12 +78,12 @@ static void alsaseq_queue_tempo_class_init(ALSASeqQueueTempoClass *klass)
     gobject_class->get_property = seq_queue_tempo_get_property;
 
     seq_queue_tempo_props[SEQ_QUEUE_TEMPO_PROP_QUEUE_ID] =
-        g_param_spec_int("queue-id", "queue-id",
-                         "The numerical ID of queue, except for one of "
-                         "ALSASeqSpecificClientId.",
-                         G_MININT, G_MAXINT,
-                         -1,
-                         G_PARAM_READWRITE);
+        g_param_spec_uchar("queue-id", "queue-id",
+                           "The numerical ID of queue, except for one of "
+                           "ALSASeqSpecificClientId.",
+                           0, G_MAXUINT8,
+                           0,
+                           G_PARAM_READWRITE);
 
     seq_queue_tempo_props[SEQ_QUEUE_TEMPO_PROP_TEMPO] =
         g_param_spec_uint("tempo", "tempo",

diff --git a/src/seq/queue-timer.c b/src/seq/queue-timer.c
index a11da3bb7dc7ade9bae8bc793ea11769ee640b77..7a9b883e26c5b85f86c43865fa30363b102d193a 100644 (file)
--- a/src/seq/queue-timer.c
+++ b/src/seq/queue-timer.c
@@ -52,12 +52,12 @@ static void alsaseq_queue_timer_class_init(ALSASeqQueueTimerClass *klass)
     gobject_class->get_property = seq_queue_timer_get_property;
 
     seq_queue_timer_props[SEQ_QUEUE_TIMER_PROP_QUEUE_ID] =
-        g_param_spec_int("queue-id", "queue-id",
-                         "The numerical ID of queue, except for one of "
-                         "ALSASeqSpecificClientId.",
-                         G_MININT, G_MAXINT,
-                         -1,
-                         G_PARAM_READABLE);
+        g_param_spec_uchar("queue-id", "queue-id",
+                           "The numerical ID of queue, except for one of "
+                           "ALSASeqSpecificClientId.",
+                           0, G_MAXUINT8,
+                           0,
+                           G_PARAM_READABLE);
 
     seq_queue_timer_props[SEQ_QUEUE_TIMER_PROP_TIMER_TYPE] =
         g_param_spec_enum("type", "type",

diff --git a/src/seq/user-client.c b/src/seq/user-client.c
index 9ae09c0f18b8fd09ef282f571f16d91187845bfb..773643c04fb86906d33fabd9629f76d4e5fd70fe 100644 (file)
--- a/src/seq/user-client.c
+++ b/src/seq/user-client.c
@@ -639,7 +639,7 @@ void alsaseq_user_client_create_queue(ALSASeqUserClient *self,
  * SNDRV_SEQ_IOCTL_DELETE_QUEUE command for ALSA sequencer character device.
  */
 void alsaseq_user_client_delete_queue(ALSASeqUserClient *self,
-                                      guint queue_id, GError **error)
+                                      guint8 queue_id, GError **error)
 {
     ALSASeqUserClientPrivate *priv;
     struct snd_seq_queue_info info = {0};
@@ -695,7 +695,7 @@ void alsaseq_user_client_update_queue(ALSASeqUserClient *self,
  * SNDRV_SEQ_IOCTL_GET_QUEUE_CLIENT command for ALSA sequencer character device.
  */
 void alsaseq_user_client_get_queue_usage(ALSASeqUserClient *self,
-                                         guint queue_id, gboolean *use,
+                                         guint8 queue_id, gboolean *use,
                                          GError **error)
 {
     ALSASeqUserClientPrivate *priv;
@@ -727,7 +727,7 @@ void alsaseq_user_client_get_queue_usage(ALSASeqUserClient *self,
  * SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT command for ALSA sequencer character device.
  */
 void alsaseq_user_client_set_queue_usage(ALSASeqUserClient *self,
-                                         guint queue_id, gboolean use,
+                                         guint8 queue_id, gboolean use,
                                          GError **error)
 {
     ALSASeqUserClientPrivate *priv;
@@ -758,7 +758,7 @@ void alsaseq_user_client_set_queue_usage(ALSASeqUserClient *self,
  * SNDRV_SEQ_IOCTL_SET_QUEUE_TEMPO command for ALSA sequencer character device.
  */
 void alsaseq_user_client_set_queue_tempo(ALSASeqUserClient *self,
-                                guint queue_id, ALSASeqQueueTempo *queue_tempo,
+                                guint8 queue_id, ALSASeqQueueTempo *queue_tempo,
                                 GError **error)
 {
     ALSASeqUserClientPrivate *priv;
@@ -788,7 +788,7 @@ void alsaseq_user_client_set_queue_tempo(ALSASeqUserClient *self,
  * SNDRV_SEQ_IOCTL_GET_QUEUE_TEMPO command for ALSA sequencer character device.
  */
 void alsaseq_user_client_get_queue_tempo(ALSASeqUserClient *self,
-                                guint queue_id, ALSASeqQueueTempo **queue_tempo,
+                                guint8 queue_id, ALSASeqQueueTempo **queue_tempo,
                                 GError **error)
 {
     ALSASeqUserClientPrivate *priv;
@@ -822,7 +822,7 @@ void alsaseq_user_client_get_queue_tempo(ALSASeqUserClient *self,
  * SNDRV_SEQ_IOCTL_SET_QUEUE_TIMER command for ALSA sequencer character device.
  */
 void alsaseq_user_client_set_queue_timer(ALSASeqUserClient *self,
-                                         guint queue_id,
+                                         guint8 queue_id,
                                          ALSASeqQueueTimer *queue_timer,
                                          GError **error)
 {
@@ -864,7 +864,7 @@ void alsaseq_user_client_set_queue_timer(ALSASeqUserClient *self,
  * SNDRV_SEQ_IOCTL_GET_QUEUE_TIMER command for ALSA sequencer character device.
  */
 void alsaseq_user_client_get_queue_timer(ALSASeqUserClient *self,
-                                         guint queue_id,
+                                         guint8 queue_id,
                                          ALSASeqQueueTimer **queue_timer,
                                          GError **error)
 {

diff --git a/src/seq/user-client.h b/src/seq/user-client.h
index 61f4a76a3dbb9979ce50694a24c1a88b4541f871..160e03b7208852c7b9d031155e4cc52b97ce2585 100644 (file)
--- a/src/seq/user-client.h
+++ b/src/seq/user-client.h
@@ -119,30 +119,30 @@ void alsaseq_user_client_create_queue(ALSASeqUserClient *self,
                                       ALSASeqQueueInfo *const *queue_info,
                                       GError **error);
 void alsaseq_user_client_delete_queue(ALSASeqUserClient *self,
-                                      guint queue_id, GError **error);
+                                      guint8 queue_id, GError **error);
 void alsaseq_user_client_update_queue(ALSASeqUserClient *self,
                                 ALSASeqQueueInfo *queue_info, GError **error);
 
 void alsaseq_user_client_get_queue_usage(ALSASeqUserClient *self,
-                                         guint queue_id, gboolean *use,
+                                         guint8 queue_id, gboolean *use,
                                          GError **error);
 void alsaseq_user_client_set_queue_usage(ALSASeqUserClient *self,
-                                         guint queue_id, gboolean use,
+                                         guint8 queue_id, gboolean use,
                                          GError **error);
 
 void alsaseq_user_client_set_queue_tempo(ALSASeqUserClient *self,
-                                guint queue_id, ALSASeqQueueTempo *queue_tempo,
+                                guint8 queue_id, ALSASeqQueueTempo *queue_tempo,
                                 GError **error);
 void alsaseq_user_client_get_queue_tempo(ALSASeqUserClient *self,
-                                guint queue_id, ALSASeqQueueTempo **queue_tempo,
+                                guint8 queue_id, ALSASeqQueueTempo **queue_tempo,
                                 GError **error);
 
 void alsaseq_user_client_set_queue_timer(ALSASeqUserClient *self,
-                                         guint queue_id,
+                                         guint8 queue_id,
                                          ALSASeqQueueTimer *queue_timer,
                                          GError **error);
 void alsaseq_user_client_get_queue_timer(ALSASeqUserClient *self,
-                                         guint queue_id,
+                                         guint8 queue_id,
                                          ALSASeqQueueTimer **queue_timer,
                                          GError **error);