ctl: rename element event mask

The 'snd_ctl_event' structure can be defined to deliver several types of
events. One of the event is for element and it includes bitflags of the
kind of event for the element. In this library, the bitflag is named so
that it represents generic event, however it should be something
specific to element event.

This commit renames the bitflag.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

diff --git a/doc/reference/ctl/alsactl.types b/doc/reference/ctl/alsactl.types
index 64fb51fc2985175f6bde81665e33fc4da805798a..40bc17ad122d2cc524e37f78fb162afa4122ccb9 100644 (file)
--- a/doc/reference/ctl/alsactl.types
+++ b/doc/reference/ctl/alsactl.types
@@ -2,7 +2,7 @@ alsactl_elem_type_get_type
 alsactl_elem_iface_type_get_type
 alsactl_elem_access_flag_get_type
 alsactl_event_type_get_type
-alsactl_event_mask_flag_get_type
+alsactl_elem_event_mask_get_type
 alsactl_card_get_type
 alsactl_card_info_get_type
 alsactl_elem_id_get_type

diff --git a/src/ctl/alsactl-enum-types.h b/src/ctl/alsactl-enum-types.h
index 1ca7e3dd4252e8c76bebd7456e14ee4cca19f1bb..6e629eac54aec468ec66303aa6237fd749f88305 100644 (file)
--- a/src/ctl/alsactl-enum-types.h
+++ b/src/ctl/alsactl-enum-types.h
@@ -91,22 +91,22 @@ typedef enum
 } ALSACtlEventType;
 
 /**
- * ALSACtlEventMaskFlag:
- * @ALSACTL_EVENT_MASK_FLAG_VALUE:      The event notifies any change of value for the element.
- * @ALSACTL_EVENT_MASK_FLAG_INFO:       The event notifies any change of information for the element.
- * @ALSACTL_EVENT_MASK_FLAG_ADD:        The element notifies addition of the element.
- * @ALSACTL_EVENT_MASK_FLAG_TLV:        The element notifies any change of Type-Length-Value data for the element.
- * @ALSACTL_EVENT_MASK_FLAG_REMOVE:     The element notifies removal of the element.
+ * ALSACtlElemEventMask:
+ * @ALSACTL_ELEM_EVENT_MASK_VALUE:  The event notifies any change of value for the element.
+ * @ALSACTL_ELEM_EVENT_MASK_INFO:   The event notifies any change of information for the element.
+ * @ALSACTL_ELEM_EVENT_MASK_ADD:    The element notifies addition of the element.
+ * @ALSACTL_ELEM_EVENT_MASK_TLV:    The element notifies any change of Type-Length-Value data for the element.
+ * @ALSACTL_ELEM_EVENT_MASK_REMOVE: The element notifies removal of the element.
  *
  * A set of flags for the content of event for the element.
  */
 typedef enum /*< flags >*/
 {
-    ALSACTL_EVENT_MASK_FLAG_VALUE   = SNDRV_CTL_EVENT_MASK_VALUE,
-    ALSACTL_EVENT_MASK_FLAG_INFO    = SNDRV_CTL_EVENT_MASK_INFO,
-    ALSACTL_EVENT_MASK_FLAG_ADD     = SNDRV_CTL_EVENT_MASK_ADD,
-    ALSACTL_EVENT_MASK_FLAG_TLV     = SNDRV_CTL_EVENT_MASK_TLV,
-    ALSACTL_EVENT_MASK_FLAG_REMOVE  = SNDRV_CTL_EVENT_MASK_TLV << 1,
-} ALSACtlEventMaskFlag;
+    ALSACTL_ELEM_EVENT_MASK_VALUE   = SNDRV_CTL_EVENT_MASK_VALUE,
+    ALSACTL_ELEM_EVENT_MASK_INFO    = SNDRV_CTL_EVENT_MASK_INFO,
+    ALSACTL_ELEM_EVENT_MASK_ADD     = SNDRV_CTL_EVENT_MASK_ADD,
+    ALSACTL_ELEM_EVENT_MASK_TLV     = SNDRV_CTL_EVENT_MASK_TLV,
+    ALSACTL_ELEM_EVENT_MASK_REMOVE  = SNDRV_CTL_EVENT_MASK_TLV << 1,
+} ALSACtlElemEventMask;
 
 #endif

diff --git a/src/ctl/alsactl.map b/src/ctl/alsactl.map
index 626071dcb46b782b3116c4a4aa090c22a5061e5b..49696c1b66ca68e8710937825004bcfdc3d6d7fa 100644 (file)
--- a/src/ctl/alsactl.map
+++ b/src/ctl/alsactl.map
@@ -4,7 +4,7 @@ ALSA_GOBJECT_0_0_0 {
     "alsactl_elem_iface_type_get_type";
     "alsactl_elem_access_flag_get_type";
     "alsactl_event_type_get_type";
-    "alsactl_event_mask_flag_get_type";
+    "alsactl_elem_event_mask_get_type";
 
     "alsactl_get_card_id_list";
     "alsactl_get_card_sysname";

diff --git a/src/ctl/card.c b/src/ctl/card.c
index 74fdd41ddbe0bccbc6b6e45a8efa9311f9f66526..c4a512b9a3dfcc44ccddf6b81e8c6de57b00b481 100644 (file)
--- a/src/ctl/card.c
+++ b/src/ctl/card.c
@@ -108,7 +108,7 @@ static void alsactl_card_class_init(ALSACtlCardClass *klass)
      * ALSACtlCard::handle-elem-event:
      * @self: A #ALSACtlCard.
      * @elem_id: (transfer none): A #ALSACtlElemId.
-     * @events: A set of #ALSACtlEventMaskFlag.
+     * @events: A set of #ALSACtlElemEventMask.
      *
      * When event occurs for any element, this signal is emit.
      */
@@ -120,7 +120,7 @@ static void alsactl_card_class_init(ALSACtlCardClass *klass)
                      NULL, NULL,
                      alsactl_sigs_marshal_VOID__BOXED_FLAGS,
                      G_TYPE_NONE, 2, ALSACTL_TYPE_ELEM_ID,
-                     ALSACTL_TYPE_EVENT_MASK_FLAG);
+                     ALSACTL_TYPE_ELEM_EVENT_MASK);
 
     /**
      * ALSACtlCard::handle-disconnection:
@@ -775,12 +775,12 @@ static void handle_elem_event(CtlCardSource *src, struct snd_ctl_event *ev)
         ALSACtlElemId *elem_id = (ALSACtlElemId *)entry->data;
 
         if (ev->data.elem.id.numid == elem_id->numid) {
-            ALSACtlEventMaskFlag mask;
+            ALSACtlElemEventMask mask;
 
             if (ev->data.elem.mask != SNDRV_CTL_EVENT_MASK_REMOVE)
                 mask = ev->data.elem.mask;
             else
-                mask = ALSACTL_EVENT_MASK_FLAG_REMOVE;
+                mask = ALSACTL_ELEM_EVENT_MASK_REMOVE;
 
             g_signal_emit(self,
                           ctl_card_sigs[CTL_CARD_SIG_HANDLE_ELEM_EVENT], 0,

diff --git a/src/ctl/card.h b/src/ctl/card.h
index 25fd3e160a14f226475942f0101483ff6b19a391..c932d00f2c9a8faad170896555144c5731268463 100644 (file)
--- a/src/ctl/card.h
+++ b/src/ctl/card.h
@@ -53,12 +53,12 @@ struct _ALSACtlCardClass {
      * ALSACtlCardClass::handle_elem_event:
      * @self: A #ALSACtlCard.
      * @elem_id: (transfer none): A #ALSACtlElemId.
-     * @events: A set of #ALSACtlEventMaskFlag.
+     * @events: A set of #ALSACtlElemEventMask.
      *
      * When event occurs for any element, this signal is emit.
      */
     void (*handle_elem_event)(ALSACtlCard *self, const ALSACtlElemId *elem_id,
-                              ALSACtlEventMaskFlag events);
+                              ALSACtlElemEventMask events);
 
     /**
      * ALSACtlCardClass::handle_disconnection:

diff --git a/tests/alsactl-enums b/tests/alsactl-enums
index 5abc1c4c40e3c616462946ddfedf6395895a1c5d..9807f362f259c821f4a15492052ce13d55149669 100644 (file)
--- a/tests/alsactl-enums
+++ b/tests/alsactl-enums
@@ -43,7 +43,7 @@ event_types = (
     'ELEM',
 )
 
-event_mask_flags = (
+elem_event_mask_flags = (
     'VALUE',
     'INFO',
     'ADD',
@@ -57,7 +57,7 @@ types = {
     ALSACtl.ElemAccessFlag: elem_access_flags,
     ALSACtl.ElemAccessFlag: elem_access_flags,
     ALSACtl.EventType:      event_types,
-    ALSACtl.EventMaskFlag:  event_mask_flags,
+    ALSACtl.ElemEventMask:  elem_event_mask_flags,
 }
 
 for obj, types in types.items():