haptic: Change g_timeout_add_seconds to g_timeout_add

- g_timeout_add interval is in milliseconds
- g_timeout_add_seconds interval is in seconds

Change-Id: Ide64c518d1249bd4861e5749a8e5122fadf71166
Signed-off-by: pr.jung <pr.jung@samsung.com>

diff --git a/src/haptic/circle.c b/src/haptic/circle.c
index 6555d40..1b63660 100644 (file)
--- a/src/haptic/circle.c
+++ b/src/haptic/circle.c
@@ -220,7 +220,7 @@ static int vibrate_monotone(int device_handle, int duration, int feedback, int p
 
        /* register timer */
        if (duration) {
-               stop_timer = g_timeout_add_seconds(duration/1000, timer_cb, (void *)(long)device_handle);
+               stop_timer = g_timeout_add(duration, timer_cb, (void *)(long)device_handle);
 
                if (!stop_timer)
                        _E("Failed to add timer callback");

diff --git a/src/haptic/gpio_haptic.c b/src/haptic/gpio_haptic.c
index c44e768..45ffdac 100644 (file)
--- a/src/haptic/gpio_haptic.c
+++ b/src/haptic/gpio_haptic.c
@@ -248,7 +248,7 @@ static int gpio_haptic_vibrate_monotone(int handle, int duration, int level, int
        /* register timer */
        if (duration) {
          //stop_timer = ecore_timer_add(duration/1000.f, gpio_haptic_timer_cb, (void *)(long)handle);
-         stop_timer = g_timeout_add_seconds(duration/1000, gpio_haptic_timer_cb, (void *)(long)handle);
+         stop_timer = g_timeout_add(duration, gpio_haptic_timer_cb, (void *)(long)handle);
                if (!stop_timer)
                        _E("Failed to add timer callback");
        }

diff --git a/src/haptic/standard-mix.c b/src/haptic/standard-mix.c
index a234ec7..578a700 100644 (file)
--- a/src/haptic/standard-mix.c
+++ b/src/haptic/standard-mix.c
@@ -488,7 +488,7 @@ static int vibrate_monotone(int device_handle, int duration, int feedback, int p
 
        /* register timer */
        if (duration) {
-               info->timer = g_timeout_add_seconds(duration/1000, timer_cb, info);
+               info->timer = g_timeout_add(duration, timer_cb, info);
                if (!info->timer)
                        _E("Failed to add timer callback");
        }
@@ -525,12 +525,12 @@ static gboolean _buffer_play(void *cbdata)
 
        if (info->currentindex < header->ff_info_data_count) {
                info->currentindex++;
-               info->timer = g_timeout_add_seconds(length/1000, _buffer_play, info);
+               info->timer = g_timeout_add(length, _buffer_play, info);
        } else {
                --header->iteration;
                if (header->iteration > 0) {
                        info->currentindex = 0;
-                       info->timer = g_timeout_add_seconds(0, _buffer_play, info);
+                       info->timer = g_timeout_add(0, _buffer_play, info);
                } else
                        info->timer = NULL;
        }
@@ -642,7 +642,7 @@ static gboolean haptic_duration_play(void *data)
                        time = duration + h_data->waiting_config[index];
 
                /*duration_timer = ecore_timer_add(time/1000.0f, haptic_duration_play, (void *)h_data);*/
-               duration_timer = g_timeout_add_seconds(time/1000, haptic_duration_play, (void *)h_data);
+               duration_timer = g_timeout_add(time, haptic_duration_play, (void *)h_data);
                _D("timer: %d", time);
        }
 

diff --git a/src/haptic/standard-vibcore.c b/src/haptic/standard-vibcore.c
index 7361bb2..f8982c9 100644 (file)
--- a/src/haptic/standard-vibcore.c
+++ b/src/haptic/standard-vibcore.c
@@ -197,9 +197,9 @@ static gboolean haptic_duration_play(void *data)
 
                if (next) {
                        h_data->vibration_data = next;
-                       duration_timer = g_timeout_add_seconds((node->duration + node->wait)/1000, haptic_duration_play, (void *)h_data);
+                       duration_timer = g_timeout_add((node->duration + node->wait), haptic_duration_play, (void *)h_data);
                } else
-                       duration_timer = g_timeout_add_seconds((node->duration + node->wait)/1000, haptic_duration_play, NULL);
+                       duration_timer = g_timeout_add((node->duration + node->wait), haptic_duration_play, NULL);
 
                ret = real_vibrate_monotone(h_data->handle, node->duration, h_data->level, h_data->priority, NULL);
                if (!next)

diff --git a/src/haptic/standard.c b/src/haptic/standard.c
index 39f6866..6a42bd1 100644 (file)
--- a/src/haptic/standard.c
+++ b/src/haptic/standard.c
@@ -452,7 +452,7 @@ static int vibrate_monotone(int device_handle, int duration, int feedback, int p
 
        /* register timer */
        if (duration) {
-               info->timer = g_timeout_add_seconds(duration/1000, timer_cb, info);
+               info->timer = g_timeout_add(duration, timer_cb, info);
                if (!info->timer)
                        _E("Failed to add timer callback");
        }
@@ -489,12 +489,12 @@ static gboolean _buffer_play(void *cbdata)
 
        if (info->currentindex < header->ff_info_data_count) {
                info->currentindex++;
-               info->timer = g_timeout_add_seconds(length/1000, _buffer_play, info);
+               info->timer = g_timeout_add(length, _buffer_play, info);
        } else {
                --header->iteration;
                if (header->iteration > 0) {
                        info->currentindex = 0;
-                       info->timer = g_timeout_add_seconds(0, _buffer_play, info);
+                       info->timer = g_timeout_add(0, _buffer_play, info);
                } else
                        info->timer = 0;
        }