Change gdbus related timeout from 120 sec to 3 sec

[Version] 0.10.97
[Profile] Common
[Issue Type] Update
[Dependency module] N/A
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-3.0-mobile_20161130.1]

Change-Id: I649e79a9ab8f723ccae901bf6e493fb44fc3670c
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec
index 34ed6db..9a0ba5d 100644 (file)
--- a/packaging/libmm-camcorder.spec
+++ b/packaging/libmm-camcorder.spec
@@ -1,6 +1,6 @@
 Name:       libmm-camcorder
 Summary:    Camera and recorder library
-Version:    0.10.96
+Version:    0.10.97
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/include/mm_camcorder_util.h b/src/include/mm_camcorder_util.h
index 75a8a6a..4035fe9 100644 (file)
--- a/src/include/mm_camcorder_util.h
+++ b/src/include/mm_camcorder_util.h
@@ -238,8 +238,7 @@ typedef struct {
 /*=======================================================================================
 | CONSTANT DEFINITIONS                                                                 |
 ========================================================================================*/
-#define G_DBUS_CB_TIMEOUT_MSEC                  3000
-#define G_DBUS_REPLY_TIMEOUT                    (120 * 1000)
+#define G_DBUS_TIMEOUT                          3000
 #define FAT32_FILE_SYSTEM_MAX_SIZE              (4294967295UL)     /* 4 GigaByte - 1 byte */
 #define NANO_SEC_PER_MILI_SEC                   1000000
 #define _MMCAMCORDER_HANDLER_CATEGORY_ALL \

diff --git a/src/mm_camcorder_util.c b/src/mm_camcorder_util.c
index 02a7cf8..6f342c6 100644 (file)
--- a/src/mm_camcorder_util.c
+++ b/src/mm_camcorder_util.c
@@ -110,7 +110,7 @@ static int __gdbus_method_call_sync(GDBusConnection *conn, const char *bus_name,
        if (is_sync) {
                dbus_reply = g_dbus_connection_call_sync(conn,
                        bus_name, object, iface, method, args, NULL,
-                       G_DBUS_CALL_FLAGS_NONE, G_DBUS_REPLY_TIMEOUT, NULL, NULL);
+                       G_DBUS_CALL_FLAGS_NONE, G_DBUS_TIMEOUT, NULL, NULL);
                if (dbus_reply) {
                        _mmcam_dbg_log("Method Call '%s.%s' Success", iface, method);
                        *result = dbus_reply;
@@ -120,7 +120,7 @@ static int __gdbus_method_call_sync(GDBusConnection *conn, const char *bus_name,
                }
        } else {
                g_dbus_connection_call(conn, bus_name, object, iface, method, args, NULL,
-                       G_DBUS_CALL_FLAGS_NONE, G_DBUS_REPLY_TIMEOUT, NULL, NULL, NULL);
+                       G_DBUS_CALL_FLAGS_NONE, G_DBUS_TIMEOUT, NULL, NULL, NULL);
        }
 
        return ret;
@@ -870,7 +870,7 @@ int _mmcamcorder_send_sound_play_message(GDBusConnection *conn, _MMCamcorderGDbu
        g_mutex_unlock(&gdbus_info->sync_mutex);
 
        if (sync_play && ret == MM_ERROR_NONE)
-               ret = __gdbus_wait_for_cb_return(gdbus_info, G_DBUS_CB_TIMEOUT_MSEC);
+               ret = __gdbus_wait_for_cb_return(gdbus_info, G_DBUS_TIMEOUT);
 
        return ret;
 }