fw_iso_resource_once: remove async/sync suffixes from deallocation methods

The request of deallocation generates completion event. In current
implementation, the method for request has async suffix, and the method to
wait for the event has sync suffix. However, these two keywords are often
heavy use in different contexts and sometimes unfriendly to developers and
users.

This commit renames these methods. The name of async method becomes
simplier, and the sync method is suffixed with wait.

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

5 files changed, 19 insertions, 16 deletions

diff --git a/samples/iso-resource b/samples/iso-resource
index dde43fe..6775379 100755
--- a/samples/iso-resource
+++ b/samples/iso-resource
@@ -48,7 +48,7 @@ for i in range(2):
     sleep(2)
 
     try:
-        res.deallocate_sync(use_channel, use_bandwidth, 100)
+        res.deallocate_wait(use_channel, use_bandwidth, 100)
     except GLib.Error as e:
         if e.matches(Hinoko.fw_iso_resource_error_quark(), Hinoko.FwIsoResourceError.EVENT):
             print(e)
diff --git a/src/fw_iso_resource_once.c b/src/fw_iso_resource_once.c
index b8d025f..ff26b66 100644
--- a/src/fw_iso_resource_once.c
+++ b/src/fw_iso_resource_once.c
@@ -203,7 +203,7 @@ HinokoFwIsoResourceOnce *hinoko_fw_iso_resource_once_new()
 }
 
 /**
- * hinoko_fw_iso_resource_once_deallocate_async:
+ * hinoko_fw_iso_resource_once_deallocate:
  * @self: A [class@FwIsoResourceOnce].
  * @channel: The channel number to be deallocated.
  * @bandwidth: The amount of bandwidth to be deallocated.
@@ -215,10 +215,10 @@ HinokoFwIsoResourceOnce *hinoko_fw_iso_resource_once_new()
  *
  * Returns: TRUE if the overall operation finishes successfully, otherwise FALSE.
  *
- * Since: 0.7
+ * Since: 1.0
  */
-gboolean hinoko_fw_iso_resource_once_deallocate_async(HinokoFwIsoResourceOnce *self, guint channel,
-						      guint bandwidth, GError **error)
+gboolean hinoko_fw_iso_resource_once_deallocate(HinokoFwIsoResourceOnce *self, guint channel,
+						guint bandwidth, GError **error)
 {
 	HinokoFwIsoResourceOncePrivate *priv;
 
@@ -248,7 +248,7 @@ gboolean hinoko_fw_iso_resource_once_deallocate_async(HinokoFwIsoResourceOnce *s
 }
 
 /**
- * hinoko_fw_iso_resource_once_deallocate_sync:
+ * hinoko_fw_iso_resource_once_deallocate_wait:
  * @self: A [class@FwIsoResourceOnce].
  * @channel: The channel number to be deallocated.
  * @bandwidth: The amount of bandwidth to be deallocated.
@@ -260,9 +260,9 @@ gboolean hinoko_fw_iso_resource_once_deallocate_async(HinokoFwIsoResourceOnce *s
  *
  * Returns: TRUE if the overall operation finishes successfully, otherwise FALSE.
  *
- * Since: 0.7
+ * Since: 1.0
  */
-gboolean hinoko_fw_iso_resource_once_deallocate_sync(HinokoFwIsoResourceOnce *self, guint channel,
+gboolean hinoko_fw_iso_resource_once_deallocate_wait(HinokoFwIsoResourceOnce *self, guint channel,
 						     guint bandwidth, guint timeout_ms,
 						     GError **error)
 {
@@ -274,7 +274,7 @@ gboolean hinoko_fw_iso_resource_once_deallocate_sync(HinokoFwIsoResourceOnce *se
 	fw_iso_resource_waiter_init(&w, HINOKO_FW_ISO_RESOURCE(self), DEALLOCATED_SIGNAL_NAME,
 				    timeout_ms);
 
-	(void)hinoko_fw_iso_resource_once_deallocate_async(self, channel, bandwidth, error);
+	(void)hinoko_fw_iso_resource_once_deallocate(self, channel, bandwidth, error);
 
 	return fw_iso_resource_waiter_wait(&w, HINOKO_FW_ISO_RESOURCE(self), error);
 }
diff --git a/src/fw_iso_resource_once.h b/src/fw_iso_resource_once.h
index c99e170..9c9d78d 100644
--- a/src/fw_iso_resource_once.h
+++ b/src/fw_iso_resource_once.h
@@ -17,10 +17,10 @@ struct _HinokoFwIsoResourceOnceClass {
 
 HinokoFwIsoResourceOnce *hinoko_fw_iso_resource_once_new();
 
-gboolean hinoko_fw_iso_resource_once_deallocate_async(HinokoFwIsoResourceOnce *self, guint channel,
-						      guint bandwidth, GError **error);
+gboolean hinoko_fw_iso_resource_once_deallocate(HinokoFwIsoResourceOnce *self, guint channel,
+						guint bandwidth, GError **error);
 
-gboolean hinoko_fw_iso_resource_once_deallocate_sync(HinokoFwIsoResourceOnce *self, guint channel,
+gboolean hinoko_fw_iso_resource_once_deallocate_wait(HinokoFwIsoResourceOnce *self, guint channel,
 						     guint bandwidth, guint timeout_ms,
 						     GError **error);
 
diff --git a/src/hinoko.map b/src/hinoko.map
index 401162d..51ca525 100644
--- a/src/hinoko.map
+++ b/src/hinoko.map
@@ -50,8 +50,6 @@ HINOKO_0_7_0 {
 
     "hinoko_fw_iso_resource_once_get_type";
     "hinoko_fw_iso_resource_once_new";
-    "hinoko_fw_iso_resource_once_deallocate_async";
-    "hinoko_fw_iso_resource_once_deallocate_sync";
 } HINOKO_0_5_0;
 
 HINOKO_0_8_0 {
@@ -81,3 +79,8 @@ HINOKO_0_8_0 {
 HINOKO_0_9_0 {
     "hinoko_fw_iso_ctx_read_cycle_time";
 } HINOKO_0_8_0;
+
+HINOKO_1_0_0 {
+    "hinoko_fw_iso_resource_once_deallocate";
+    "hinoko_fw_iso_resource_once_deallocate_wait";
+} HINOKO_0_9_0;
diff --git a/tests/fw-iso-resource-once b/tests/fw-iso-resource-once
index b4d475d..7b3f03f 100644
--- a/tests/fw-iso-resource-once
+++ b/tests/fw-iso-resource-once
@@ -16,8 +16,8 @@ props = (
 )
 methods = (
     'new',
-    'deallocate_async',
-    'deallocate_sync',
+    'deallocate',
+    'deallocate_wait',
     # From interface.
     'open',
     'create_source',