sound_manager_private: Use #define directive for timeout value

Some of cases used with the value of 1000 are also revised to
use the same value of the define.

[Version] 0.6.4
[Issue Type] Revise

Change-Id: Ic0d9ea6d54575739e4c75ece20773c6fd3030059
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>
(cherry picked from commit 7b3c55c1ab0e99d3daef9bb93b15bb66eba83ed2)

diff --git a/packaging/capi-media-sound-manager.spec b/packaging/capi-media-sound-manager.spec
index 61e237b06afda2418edd896da79a3a0f44457e8a..0287646756ce5a0f2d9faeeabd9e3bdaa6d5649c 100644 (file)
--- a/packaging/capi-media-sound-manager.spec
+++ b/packaging/capi-media-sound-manager.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-sound-manager
 Summary:    Sound Manager library
-Version:    0.6.3
+Version:    0.6.4
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/sound_manager_private.c b/src/sound_manager_private.c
index 3fcb782bf562450cec92d25d3b438b640f61f8f8..35544aca41694138810a6afa96fa77539fdfb8d2 100644 (file)
--- a/src/sound_manager_private.c
+++ b/src/sound_manager_private.c
@@ -971,7 +971,7 @@ int _get_stream_conf_info(const char *stream_type, stream_conf_info_s *info)
                                                        g_variant_new("(s)", stream_type),
                                                        G_VARIANT_TYPE("(vvvvvv)"),
                                                        G_DBUS_CALL_FLAGS_NONE,
-                                                       2000,
+                                                       DBUS_METHOD_TIMEOUT,
                                                        NULL,
                                                        &err);
        if (!result || err) {
@@ -1130,7 +1130,7 @@ int _set_manual_route_info(unsigned int index, manual_route_info_s *info)
                                                        g_variant_new("(uauau)", index, builder_for_in_devices, builder_for_out_devices),
                                                        G_VARIANT_TYPE("(s)"),
                                                        G_DBUS_CALL_FLAGS_NONE,
-                                                       2000,
+                                                       DBUS_METHOD_TIMEOUT,
                                                        NULL,
                                                        &err);
        if (!result || err) {
@@ -1185,7 +1185,7 @@ int _set_route_option(unsigned int index, const char *name, int value)
                                                        g_variant_new("(usi)", index, name, value),
                                                        G_VARIANT_TYPE("(s)"),
                                                        G_DBUS_CALL_FLAGS_NONE,
-                                                       2000,
+                                                       DBUS_METHOD_TIMEOUT,
                                                        NULL,
                                                        &err);
        if (!result || err) {
@@ -1234,7 +1234,7 @@ int _get_volume_max_level(const char *direction, const char *volume_type, unsign
                                                        g_variant_new("(ss)", direction, volume_type),
                                                        G_VARIANT_TYPE("(us)"),
                                                        G_DBUS_CALL_FLAGS_NONE,
-                                                       2000,
+                                                       DBUS_METHOD_TIMEOUT,
                                                        NULL,
                                                        &err);
        if (!result || err) {
@@ -1283,7 +1283,7 @@ int _get_volume_level(const char *direction, const char *volume_type, unsigned i
                                                        g_variant_new("(ss)", direction, volume_type),
                                                        G_VARIANT_TYPE("(us)"),
                                                        G_DBUS_CALL_FLAGS_NONE,
-                                                       2000,
+                                                       DBUS_METHOD_TIMEOUT,
                                                        NULL,
                                                        &err);
        if (!result || err) {
@@ -1330,7 +1330,7 @@ int _set_volume_level(const char *direction, const char *volume_type, unsigned i
                                                        g_variant_new("(ssu)", direction, volume_type, level),
                                                        G_VARIANT_TYPE("(s)"),
                                                        G_DBUS_CALL_FLAGS_NONE,
-                                                       2000,
+                                                       DBUS_METHOD_TIMEOUT,
                                                        NULL,
                                                        &err);
        if (!result || err) {
@@ -1383,7 +1383,7 @@ int _get_current_volume_type(const char *direction, char **volume_type)
                                                        g_variant_new("(s)", direction),
                                                        G_VARIANT_TYPE("(ss)"),
                                                        G_DBUS_CALL_FLAGS_NONE,
-                                                       2000,
+                                                       DBUS_METHOD_TIMEOUT,
                                                        NULL,
                                                        &err);
        if (!result || err) {
@@ -1437,7 +1437,7 @@ int _get_current_media_routing_path(const char *direction, sound_device_type_e *
                                                        g_variant_new("(s)", direction),
                                                        G_VARIANT_TYPE("(ss)"),
                                                        G_DBUS_CALL_FLAGS_NONE,
-                                                       2000,
+                                                       DBUS_METHOD_TIMEOUT,
                                                        NULL,
                                                        &err);
        if (!result || err) {
@@ -1488,7 +1488,7 @@ void _update_focus_status(unsigned int index, unsigned int acquired_focus_status
                                                        g_variant_new("(uu)", index, acquired_focus_status),
                                                        G_VARIANT_TYPE("(s)"),
                                                        G_DBUS_CALL_FLAGS_NONE,
-                                                       2000,
+                                                       DBUS_METHOD_TIMEOUT,
                                                        NULL,
                                                        &err);
        if (!result || err) {
@@ -1533,7 +1533,7 @@ int _is_device_running_by_id(int device_id, bool *is_running)
                                                                          g_variant_new("(i)", device_id),
                                                                          G_VARIANT_TYPE("(b)"),
                                                                          G_DBUS_CALL_FLAGS_NONE,
-                                                                         2000,
+                                                                         DBUS_METHOD_TIMEOUT,
                                                                          NULL,
                                                                          &err);
        if (err) {
@@ -1582,7 +1582,7 @@ int _get_supported_sample_formats(int device_id, sound_sample_format_e **formats
                                                        g_variant_new("(i)", device_id),
                                                        G_VARIANT_TYPE("(as)"),
                                                        G_DBUS_CALL_FLAGS_NONE,
-                                                       2000,
+                                                       DBUS_METHOD_TIMEOUT,
                                                        NULL,
                                                        &err);
        if (!result || err) {
@@ -1653,7 +1653,7 @@ int _set_sample_format(int device_id, sound_sample_format_e format)
                                                g_variant_new("(is)", device_id, format_str),
                                                NULL,
                                                G_DBUS_CALL_FLAGS_NONE,
-                                               2000,
+                                               DBUS_METHOD_TIMEOUT,
                                                NULL,
                                                &err);
        if (err) {
@@ -1689,7 +1689,7 @@ int _get_sample_format(int device_id, sound_sample_format_e *format)
                                                        g_variant_new("(i)", device_id),
                                                        G_VARIANT_TYPE("(s)"),
                                                        G_DBUS_CALL_FLAGS_NONE,
-                                                       2000,
+                                                       DBUS_METHOD_TIMEOUT,
                                                        NULL,
                                                        &err);
        if (!result || err) {
@@ -1741,7 +1741,7 @@ int _get_supported_sample_rates(int device_id, sound_sample_rate_e **rates, unsi
                                                        g_variant_new("(i)", device_id),
                                                        G_VARIANT_TYPE("(au)"),
                                                        G_DBUS_CALL_FLAGS_NONE,
-                                                       2000,
+                                                       DBUS_METHOD_TIMEOUT,
                                                        NULL,
                                                        &err);
        if (!result || err) {
@@ -1812,7 +1812,7 @@ int _set_sample_rate(int device_id, sound_sample_rate_e rate)
                                                g_variant_new("(iu)", device_id, _rate),
                                                NULL,
                                                G_DBUS_CALL_FLAGS_NONE,
-                                               2000,
+                                               DBUS_METHOD_TIMEOUT,
                                                NULL,
                                                &err);
        if (err) {
@@ -1848,7 +1848,7 @@ int _get_sample_rate(int device_id, sound_sample_rate_e *rate)
                                                        g_variant_new("(i)", device_id),
                                                        G_VARIANT_TYPE("(u)"),
                                                        G_DBUS_CALL_FLAGS_NONE,
-                                                       2000,
+                                                       DBUS_METHOD_TIMEOUT,
                                                        NULL,
                                                        &err);
        if (!result || err) {
@@ -1889,7 +1889,7 @@ int _set_avoid_resampling(int device_id, bool enable)
                                                g_variant_new("(ib)", device_id, enable),
                                                NULL,
                                                G_DBUS_CALL_FLAGS_NONE,
-                                               2000,
+                                               DBUS_METHOD_TIMEOUT,
                                                NULL,
                                                &err);
        if (err) {
@@ -1924,7 +1924,7 @@ int _get_avoid_resampling(int device_id, bool *enabled)
                                                        g_variant_new("(i)", device_id),
                                                        G_VARIANT_TYPE("(b)"),
                                                        G_DBUS_CALL_FLAGS_NONE,
-                                                       2000,
+                                                       DBUS_METHOD_TIMEOUT,
                                                        NULL,
                                                        &err);
        if (!result || err) {
@@ -1968,7 +1968,7 @@ int _set_media_stream_only(int device_id, bool enable)
                                                g_variant_new("(is)", device_id, stream_type),
                                                NULL,
                                                G_DBUS_CALL_FLAGS_NONE,
-                                               2000,
+                                               DBUS_METHOD_TIMEOUT,
                                                NULL,
                                                &err);
        if (err) {
@@ -2003,7 +2003,7 @@ int _get_media_stream_only(int device_id, bool *enabled)
                                                        g_variant_new("(i)", device_id),
                                                        G_VARIANT_TYPE("(s)"),
                                                        G_DBUS_CALL_FLAGS_NONE,
-                                                       2000,
+                                                       DBUS_METHOD_TIMEOUT,
                                                        NULL,
                                                        &err);
        if (!result || err) {
@@ -2779,7 +2779,7 @@ int _set_volume_ratio(uint32_t stream_index, sound_stream_direction_e direction,
                                                g_variant_new("(sud)", (direction == SOUND_STREAM_DIRECTION_OUTPUT) ? "out" : "in", stream_index, ratio),
                                                G_VARIANT_TYPE("(s)"),
                                                G_DBUS_CALL_FLAGS_NONE,
-                                               2000,
+                                               DBUS_METHOD_TIMEOUT,
                                                NULL,
                                                &err);
        if (!result || err) {
@@ -2852,7 +2852,7 @@ int _set_acm_master_mode(bool on)
                                                                          g_variant_new("(u)", (unsigned int)on),
                                                                          NULL,
                                                                          G_DBUS_CALL_FLAGS_NONE,
-                                                                         2000,
+                                                                         DBUS_METHOD_TIMEOUT,
                                                                          NULL,
                                                                          &err);
        if (err) {
@@ -2890,7 +2890,7 @@ int _activate_ducking(uint32_t stream_index, bool enable, const char *target_str
                g_variant_new("(ubsud)", stream_index, enable, target_stream, duration, ratio),
                G_VARIANT_TYPE("(s)"),
                G_DBUS_CALL_FLAGS_NONE,
-               2000,
+               DBUS_METHOD_TIMEOUT,
                NULL,
                &err);
        if (!result || err) {
@@ -2945,7 +2945,7 @@ int _get_ducking_state(sound_pa_info_s *pa_info, bool *is_ducked)
                g_variant_new("(u)", pa_info->index),
                G_VARIANT_TYPE("(bs)"),
                G_DBUS_CALL_FLAGS_NONE,
-               1000,
+               DBUS_METHOD_TIMEOUT,
                NULL,
                &err);
        if (!result || err) {
@@ -3010,7 +3010,7 @@ static int __invoke_ipc_set_preferred_device_id(sound_stream_info_s *stream_info
                        g_variant_new("(usu)", stream_info->pa_info.index, direction_str, (unsigned int)device_id),
                        NULL,
                        G_DBUS_CALL_FLAGS_NONE,
-                       2000,
+                       DBUS_METHOD_TIMEOUT,
                        NULL,
                        &err);
                if (!result || err) {
@@ -3147,7 +3147,7 @@ int _get_preferred_device(sound_stream_info_s *stream_info, int *in_device_id, i
                g_variant_new("(u)", stream_info->pa_info.index),
                G_VARIANT_TYPE("(uus)"),
                G_DBUS_CALL_FLAGS_NONE,
-               1000,
+               DBUS_METHOD_TIMEOUT,
                NULL,
                &err);
        if (!result || err) {
@@ -3369,7 +3369,7 @@ int _get_latest_stream_pid(int stream_type, unsigned int *pid)
                g_variant_new("(sas)", "out", builder_for_stream_types),
                G_VARIANT_TYPE("(us)"),
                G_DBUS_CALL_FLAGS_NONE,
-               1000,
+               DBUS_METHOD_TIMEOUT,
                NULL,
                &err);
        if (!result || err) {