Replaced DBus API's with GDBus API's

Change-Id: Ib0345ac30dc4c92031f714a3a29e989d76cfef83
Signed-off-by: bhutani.92 <bhutani.92@samsung.com>

diff --git a/playview/src/common/vp-play-util.c b/playview/src/common/vp-play-util.c
index 835d4e7..4622632 100644 (file)
--- a/playview/src/common/vp-play-util.c
+++ b/playview/src/common/vp-play-util.c
@@ -44,6 +44,9 @@
 #include "vp-play-value-define.h"
 #include "vp-play-macro-define.h"
 
+/* Dbus Replacement */
+#include <gio/gio.h>
+
 #ifdef ENABLE_DRM_FEATURE
 #include "vp-drm.h"
 #endif
@@ -1280,15 +1283,16 @@ void vp_play_util_set_object_offset(Evas_Object *obj, int left, int top,
        free(msg);
 }
 
-#if 0//Tizen3.0 Build error
-static int __vp_play_util_append_variant(DBusMessageIter *iter, const char *sig, const char *param[])
+static int __vp_play_util_append_variant(GDBusMessage *msg, const char *sig, const char *param[])
 {
-       VideoLogInfo("");
-
        char *ch;
        int i;
        int int_type;
        uint64_t int64_type;
+       GVariant *result_int32;
+       GVariant *result_uint32;
+       GVariant *result_uint64;
+       GVariant *result_string;
 
        if (!sig || !param) {
                VideoLogInfo("!sig || !param");
@@ -1301,18 +1305,22 @@ static int __vp_play_util_append_variant(DBusMessageIter *iter, const char *sig,
                switch (*ch) {
                case 'i':
                        int_type = atoi(param[i]);
-                       dbus_message_iter_append_basic(iter, DBUS_TYPE_INT32, &int_type);
+                       result_int32 = g_variant_new ("i", int_type);
+                       g_dbus_message_set_body(msg, result_int32);
                        break;
                case 'u':
                        int_type = atoi(param[i]);
-                       dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &int_type);
+                       result_uint32 = g_variant_new("u", int_type);
+                       g_dbus_message_set_body(msg, result_uint32);
                        break;
                case 't':
                        int64_type = atoi(param[i]);
-                       dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT64, &int64_type);
+                       result_uint64 = g_variant_new("t", int64_type);
+                       g_dbus_message_set_body(msg, result_uint64);
                        break;
                case 's':
-                       dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &(param[i]));
+                       result_string = g_variant_new("s", param[i]);
+                       g_dbus_message_set_body(msg, result_string);
                        break;
                default:
                        return -EINVAL;
@@ -1322,66 +1330,61 @@ static int __vp_play_util_append_variant(DBusMessageIter *iter, const char *sig,
        return 0;
 }
 
-#define DBUS_REPLY_TIMEOUT (120 * 1000)
-DBusMessage * vp_play_util_invoke_dbus_method(const char *dest, const char *path,
+#define GDBUS_REPLY_TIMEOUT (-1)
+GDBusMessage * vp_play_util_invoke_dbus_method(const char *dest, const char *path,
         const char *interface, const char *method,
         const char *sig, const char *param[])
 {
        VideoLogInfo("");
 
-       DBusConnection *conn;
-       DBusMessage *msg;
-       DBusMessageIter iter;
-       DBusMessage *reply;
-       DBusError err;
+       GDBusConnection *conn = NULL;
+       GDBusMessage *msg = NULL;
+       GDBusMessage *reply = NULL;
+       GError *err = NULL;
        int r;
 
-       conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
+       conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
        if (!conn) {
-               VideoLogError("dbus_bus_get error");
+               VideoLogError("e_dbus_bus_get error: %s", err ? err->message : "none");
+               g_error_free(err);
                return NULL;
        }
 
-       msg = dbus_message_new_method_call(dest, path, interface, method);
+       msg = g_dbus_message_new_method_call(dest, path, interface, method);
        if (!msg) {
                VideoLogError("dbus_message_new_method_call error!");
+               g_object_unref(conn);
                return NULL;
        }
 
-       dbus_message_iter_init_append(msg, &iter);
-
-       r = __vp_play_util_append_variant(&iter, sig, param);
+       r = __vp_play_util_append_variant(msg, sig, param);
        if (r < 0) {
                VideoLogError("append_variant error(%d)", r);
-               dbus_message_unref(msg);
+               g_object_unref(msg);
                return NULL;
        }
 
-       dbus_error_init(&err);
-
-       reply = dbus_connection_send_with_reply_and_block(conn, msg, DBUS_REPLY_TIMEOUT, &err);
+       reply = g_dbus_connection_send_message_with_reply_sync(conn, msg, G_DBUS_SEND_MESSAGE_FLAGS_NONE, GDBUS_REPLY_TIMEOUT, NULL, NULL, &err);
        if (!reply) {
-               VideoLogError("dbus_connection_send error(No reply)");
-       }
-
-       if (dbus_error_is_set(&err)) {
-               VideoLogError("dbus_connection_send error(%s:%s)", err.name, err.message);
-               reply = NULL;
+               VideoLogError("g_dbus_connection_send_message_with_reply_sync error : (%s) %s %s:%s-%s", err ? err->message : "none", dest, path, interface, method);
+               g_error_free(err);
+               g_object_unref(msg);
+               g_object_unref(conn);
+       } else {
+               VideoLogInfo("g_dbus_connection_send_message_with_reply_sync success");
        }
 
-       dbus_message_unref(msg);
-       dbus_error_free(&err);
-
        return reply;
 }
 
 void
 vp_play_util_set_lock_power_key()
 {
+       VideoLogDebug("lock power key pressed");
        const char *arr[] = {"lcdon", "gotostatenow", "holdkeyblock", "0"};
 
 
-       DBusMessage *msg;
+       GDBusMessage *msg;
 
        msg = vp_play_util_invoke_dbus_method("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display",
                                              "org.tizen.system.deviced.display", "lockstate", "sssi", arr);
@@ -1395,9 +1398,10 @@ vp_play_util_set_lock_power_key()
 void
 vp_play_util_set_unlock_power_key()
 {
+       VideoLogDebug("unlock power key pressed");
        const char *arr[] = {"lcdon", "resettimer"};
 
-       DBusMessage *msg;
+       GDBusMessage *msg = NULL;
 
        msg = vp_play_util_invoke_dbus_method("org.tizen.system.deviced", "/Org/Tizen/System/DeviceD/Display",
                                              "org.tizen.system.deviced.display", "unlockstate", "ss", arr);
@@ -1407,17 +1411,7 @@ vp_play_util_set_unlock_power_key()
                return;
        }
 }
-#else
-void
-vp_play_util_set_lock_power_key()
-{
-}
 
-void
-vp_play_util_set_unlock_power_key()
-{
-}
-#endif
 void vp_play_util_focus_next_object_set(Evas_Object *obj,
                                         Evas_Object *next,
                                         Elm_Focus_Direction dir)

diff --git a/playview/src/core/vp-mm-player.c b/playview/src/core/vp-mm-player.c
index 01244c0..6d44e00 100644 (file)
--- a/playview/src/core/vp-mm-player.c
+++ b/playview/src/core/vp-mm-player.c
@@ -1230,21 +1230,17 @@ mm_player_handle vp_mm_player_create()
 
        VideoLogInfo(">> player create");
 
-       sound_manager_get_focus_reacquisition(pMMPlayer->stream_info, &pMMPlayer->reacquire_state);
-       if (pMMPlayer->reacquire_state == EINA_FALSE)
-               sound_manager_set_focus_reacquisition(pMMPlayer->stream_info, EINA_TRUE);
-       sound_stream_focus_state_e state_for_playback;
-       sound_stream_focus_state_e state_for_recording;
-       int ret = -1;
-       ret = sound_manager_get_focus_state(pMMPlayer->stream_info, &state_for_playback, &state_for_recording);
-       if (ret != SOUND_MANAGER_ERROR_NONE) {
-               VideoLogError("failed to get focus state error[%x]", ret);
-               }
-       if (state_for_playback == SOUND_STREAM_FOCUS_STATE_RELEASED) {
-               int error = SOUND_MANAGER_ERROR_NONE;
+       if (pMMPlayer->stream_info) {
+               int error = SOUND_MANAGER_ERROR_NONE;
                error = sound_manager_acquire_focus(pMMPlayer->stream_info, SOUND_STREAM_FOCUS_FOR_PLAYBACK, NULL);
-               if (error != SOUND_MANAGER_ERROR_NONE)
+               if (error != SOUND_MANAGER_ERROR_NONE) {
                        VideoLogError("failed to acquire focus [%x]", error);
+               }
+
+               sound_manager_get_focus_reacquisition(pMMPlayer->stream_info, &pMMPlayer->reacquire_state);
+               if (&pMMPlayer->reacquire_state == EINA_FALSE) {
+                       sound_manager_set_focus_reacquisition(pMMPlayer->stream_info, EINA_TRUE);
+               }
        }
 
        int nRet = 0;