Improve log readability 57/68657/1 accepted/tizen/common/20160509.135105 accepted/tizen/ivi/20160510.002424 accepted/tizen/mobile/20160510.002404 submit/tizen/20160509.080252
authorWootak Jung <wootak.jung@samsung.com>
Mon, 9 May 2016 07:23:38 +0000 (16:23 +0900)
committerWootak Jung <wootak.jung@samsung.com>
Mon, 9 May 2016 07:26:44 +0000 (16:26 +0900)
Change-Id: Iefe9796d7b52523c0b09538fc08bac86023d109f

module/src/callmgr-audio.c
packaging/call-manager.spec
service/src/callmgr-dbus.c

index 224cf85..a1ace1d 100755 (executable)
@@ -82,6 +82,56 @@ int _callmgr_audio_deinit(callmgr_audio_handle_h audio_handle)
        return 0;
 }
 
+static char *__callmgr_audio_convert_device_type_to_string(sound_device_type_e device_type)
+{
+       switch (device_type) {
+       case SOUND_DEVICE_BUILTIN_SPEAKER:
+               return "Built-in speaker";
+       case SOUND_DEVICE_BUILTIN_RECEIVER:
+               return "Built-in receiver";
+       case SOUND_DEVICE_BUILTIN_MIC:
+               return "Built-in mic";
+       case SOUND_DEVICE_AUDIO_JACK:
+               return "Audio jac";
+       case SOUND_DEVICE_BLUETOOTH:
+               return "Bluetooth";
+       case SOUND_DEVICE_HDMI:
+               return "HDMI";
+       case SOUND_DEVICE_FORWARDING:
+               return "Forwarding";
+       case SOUND_DEVICE_USB_AUDIO:
+               return "USB Audio";
+       default:
+               return "Unknown device";
+       }
+}
+
+static char *__callmgr_audio_convert_io_direction_to_string(sound_device_io_direction_e direction)
+{
+       switch (direction) {
+       case SOUND_DEVICE_IO_DIRECTION_IN:
+               return "IN";
+       case SOUND_DEVICE_IO_DIRECTION_OUT:
+               return "OUT";
+       case SOUND_DEVICE_IO_DIRECTION_BOTH:
+               return "BOTH";
+       default:
+               return "Unknown direction";
+       }
+}
+
+static char *__callmgr_audio_convert_device_state_to_string(sound_device_state_e device_state)
+{
+       switch (device_state) {
+       case SOUND_DEVICE_STATE_DEACTIVATED:
+               return "Deactivated";
+       case SOUND_DEVICE_STATE_ACTIVATED:
+               return "Activated";
+       default:
+               return "Unknown state";
+       }
+}
+
 static void __callmgr_audio_available_route_changed_cb(sound_device_h device, bool is_connected, void *user_data)
 {
        CM_RETURN_IF_FAIL(user_data);
@@ -89,8 +139,10 @@ static void __callmgr_audio_available_route_changed_cb(sound_device_h device, bo
        callmgr_audio_handle_h audio_handle = (callmgr_audio_handle_h)user_data;
        sound_device_type_e device_type = SOUND_DEVICE_BUILTIN_RECEIVER;
 
-       sound_manager_get_device_type(device, &device_type);;
-       info("Available route : %d (%d)", device_type, is_connected);
+       sound_manager_get_device_type(device, &device_type);
+       info("Available route : %s (%d)",
+               __callmgr_audio_convert_device_type_to_string(device_type),
+               is_connected ? "Connected" : "Disconnected");
 
        if (device_type == SOUND_DEVICE_AUDIO_JACK) {
                audio_handle->cb_fn(CM_AUDIO_EVENT_EARJACK_CHANGED_E, (void *)is_connected, audio_handle->user_data);
@@ -109,21 +161,22 @@ static void __callmgr_audio_active_device_changed_cb(sound_device_h device, soun
        int ret = SOUND_MANAGER_ERROR_NONE;
 
        ret = sound_manager_get_device_io_direction(device, &io_direction);
-       if (ret != SOUND_MANAGER_ERROR_NONE) {
-               err("sound_manager_get_device_io_direction() get failed with err[%]", ret);
-       }
+       if (ret != SOUND_MANAGER_ERROR_NONE)
+               err("sound_manager_get_device_io_direction() get failed with err[0x%x]", ret);
 
        ret = sound_manager_get_device_state(device, &state);
-       if (ret != SOUND_MANAGER_ERROR_NONE) {
-               err("sound_manager_get_device_state() get failed with err[%]", ret);
-       }
+       if (ret != SOUND_MANAGER_ERROR_NONE)
+               err("sound_manager_get_device_state() get failed with err[0x%x]", ret);
 
        ret = sound_manager_get_device_type(device, &device_type);
-       if (ret != SOUND_MANAGER_ERROR_NONE) {
-               err("sound_manager_get_device_type() get failed with err[%]", ret);
-       }
+       if (ret != SOUND_MANAGER_ERROR_NONE)
+               err("sound_manager_get_device_type() get failed with err[0x%x]", ret);
+
+       info("Active device[%s], IO direction[%s], State[%s]",
+               __callmgr_audio_convert_device_type_to_string(device_type),
+               __callmgr_audio_convert_io_direction_to_string(io_direction),
+               __callmgr_audio_convert_device_state_to_string(state));
 
-       info("Active device[%d], IO direction[%d], State[%d]", device_type, io_direction, state);
        if ((io_direction == SOUND_DEVICE_IO_DIRECTION_IN) || (state == SOUND_DEVICE_STATE_DEACTIVATED)) {
                info("No need to inform callmgr-core of this change");
                return;
@@ -298,34 +351,6 @@ int _callmgr_audio_destroy_call_sound_session(callmgr_audio_handle_h audio_handl
        return 0;
 }
 
-static int __callmgr_audio_get_device_type_string(sound_device_type_e device_type, char **str_device_type)
-{
-       CM_RETURN_VAL_IF_FAIL(str_device_type, -1);
-       switch(device_type) {
-               case SOUND_DEVICE_BUILTIN_SPEAKER:
-                       *str_device_type = g_strdup("SPEAKER");
-                       break;
-               case SOUND_DEVICE_BUILTIN_RECEIVER:
-                       *str_device_type = g_strdup("RECEIVER");
-                       break;
-               case SOUND_DEVICE_BUILTIN_MIC:
-                       *str_device_type = g_strdup("MIC");
-                       break;
-               case SOUND_DEVICE_AUDIO_JACK:
-                       *str_device_type = g_strdup("EARJACK");
-                       break;
-               case SOUND_DEVICE_BLUETOOTH:
-                       *str_device_type = g_strdup("BT");
-                       break;
-               default:
-                       err("unhandled device type: [%d]", device_type);
-                       *str_device_type = g_strdup("UNKNOWN DEVICE");
-                       return -1;
-       }
-
-       return 0;
-}
-
 static int __callmgr_audio_get_sound_device(sound_device_type_e device_type, sound_device_h *sound_device)
 {
        sound_device_list_h device_list = NULL;
@@ -517,7 +542,6 @@ int _callmgr_audio_set_audio_route(callmgr_audio_handle_h audio_handle, callmgr_
        int ret = -1;
        sound_device_h sound_device = NULL;
        sound_device_type_e device_type;
-       char *str_device = NULL;
 
        CM_RETURN_VAL_IF_FAIL(audio_handle, -1);
        CM_RETURN_VAL_IF_FAIL(audio_handle->sound_stream_handle, -1);
@@ -583,9 +607,7 @@ int _callmgr_audio_set_audio_route(callmgr_audio_handle_h audio_handle, callmgr_
                return -1;
        }
 
-       __callmgr_audio_get_device_type_string(device_type, &str_device);
-       info("set audio route to: [%s]", str_device);
-       g_free(str_device);
+       info("set audio route to: [%s]", __callmgr_audio_convert_device_type_to_string(device_type));
 
        if ((route == CALLMGR_AUDIO_ROUTE_SPEAKER_E) || (route == CALLMGR_AUDIO_ROUTE_RECEIVER_E)) {
                sound_device_h mic = NULL;
@@ -633,7 +655,6 @@ int _callmgr_audio_set_audio_route(callmgr_audio_handle_h audio_handle, callmgr_
 int _callmgr_audio_get_audio_route(callmgr_audio_handle_h audio_handle, callmgr_audio_route_e *o_route)
 {
        callmgr_audio_route_e route = CALLMGR_AUDIO_ROUTE_NONE_E;
-       char *str_device = NULL;
        CM_RETURN_VAL_IF_FAIL(audio_handle, -1);
        CM_RETURN_VAL_IF_FAIL(o_route, -1);
        dbg(">>");
@@ -659,9 +680,7 @@ int _callmgr_audio_get_audio_route(callmgr_audio_handle_h audio_handle, callmgr_
        }
        *o_route = route;
 
-       __callmgr_audio_get_device_type_string(audio_handle->current_route, &str_device);
-       info("current device : [%s]", str_device);
-       g_free(str_device);
+       info("current device : [%s]", __callmgr_audio_convert_device_type_to_string(audio_handle->current_route));
 
        return 0;
 }
index d7b2772..81b544d 100755 (executable)
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 1
-%define patchlevel 62
+%define patchlevel 63
 %define ext_feature 0
 
 Name:           call-manager
index eea942c..fd05091 100644 (file)
 
 static int __callmgr_dbus_get_gv_from_call_data(callmgr_core_data_t *core_data, callmgr_call_data_t *call_data, GVariant **gv);
 
+static char *__callmgr_dbus_convert_call_state_to_string(cm_telephony_call_state_e call_state)
+{
+       switch (call_state) {
+       case CM_TEL_CALL_STATE_IDLE:
+               return "IDLE";
+       case CM_TEL_CALL_STATE_ACTIVE:
+               return "ACTIVE";
+       case CM_TEL_CALL_STATE_HELD:
+               return "HELD";
+       case CM_TEL_CALL_STATE_DIALING:
+               return "DIALING";
+       case CM_TEL_CALL_STATE_ALERT:
+               return "ALERT";
+       case CM_TEL_CALL_STATE_INCOMING:
+               return "INCOMING";
+       case CM_TEL_CALL_STATE_WAITING:
+               return "WAITING";
+       case CM_TEL_CALL_STATE_MAX:
+       default:
+               return "UNKNOWN";
+       }
+}
+
 /*********************************************
 ************* Signal Handler *********************
 **********************************************/
@@ -401,21 +424,19 @@ static gboolean __get_call_list_handler (GDBusInterfaceSkeleton *di,
                /*11. Fetch personId from callId*/
                _callmgr_ct_get_person_id(call_id, &person_id);
 
-               dbg("\n\n <<<<<<<<< CallData Info in Daemon START >>>>>>>>>> \n");
-               dbg("call_id                : %d, ", call_id);
-               dbg("call_direction         : %d, ", call_direction);
-               if (call_number) {
-                       dbg("call_number            : %s, ", call_number);
-               }
-               if (calling_name) {
-                       dbg("calling_name            : %s, ", calling_name);
-               }
-               dbg("call_type                  : %d, ", call_type);
-               dbg("call_state                 : %d, ", call_state);
-               dbg("is_conference          : %d, ", is_conference);
-               dbg("is_ecc                     : %d, ", is_ecc);
-               dbg("person_id              : %d", person_id);
-               dbg("\n\n <<<<<<<<< CallData Info in Daemon END >>>>>>>>>> \n");
+               dbg("<<<<<<<<< CallData Info in Daemon START >>>>>>>>>>");
+               dbg("call_id       : %d", call_id);
+               dbg("call_direction: %d", call_direction);
+               if (call_number)
+                       dbg("call_number   : %s", call_number);
+               if (calling_name)
+                       dbg("calling_name  : %s", calling_name);
+               dbg("call_type     : %d", call_type);
+               dbg("call_state    : %s", __callmgr_dbus_convert_call_state_to_string(call_state));
+               dbg("is_conference : %d", is_conference);
+               dbg("is_ecc        : %d", is_ecc);
+               dbg("person_id     : %d", person_id);
+               dbg("<<<<<<<<< CallData Info in Daemon END >>>>>>>>>>");
 
                g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                g_variant_builder_add(&b, "{sv}", "call_id", g_variant_new_uint32(call_id));
@@ -504,14 +525,13 @@ static gboolean __get_conf_call_list_handler (GDBusInterfaceSkeleton *di,
                /*5. Fetch name_mode from callData*/
                _callmgr_telephony_get_call_name_mode(call_obj, &name_mode);
 
-               dbg("\n\n <<<<<<<<< CallData Info in Daemon START >>>>>>>>>> \n");
-               dbg("call_id                : %d, ", call_id);
-               if (call_number) {
-                       dbg("call_number            : %s, ", call_number);
-               }
-               dbg("person_id              : %d", person_id);
-               dbg("name_mode              : %d", name_mode);
-               dbg("\n\n <<<<<<<<< CallData Info in Daemon END >>>>>>>>>> \n");
+               dbg("<<<<<<<<< CallData Info in Daemon START >>>>>>>>>>");
+               dbg("call_id    : %d", call_id);
+               if (call_number)
+                       dbg("call_number: %s", call_number);
+               dbg("person_id  : %d", person_id);
+               dbg("name_mode  : %d", name_mode);
+               dbg("<<<<<<<<< CallData Info in Daemon END >>>>>>>>>>");
 
                g_variant_builder_open(&b, G_VARIANT_TYPE("a{sv}"));
                g_variant_builder_add(&b, "{sv}", "call_id", g_variant_new_uint32(call_id));
@@ -1100,23 +1120,21 @@ static int __callmgr_dbus_get_gv_from_call_data(callmgr_core_data_t *core_data,
        /*Fetch personId by call ID*/
        _callmgr_ct_get_person_id(call_data->call_id, &person_id);
 
-       dbg("\n\n <<<<<<<<< CallData Info in Daemon START >>>>>>>>>> \n");
-       dbg("call_id                : %d, ", call_data->call_id);
-       dbg("call_direction         : %d, ", call_data->call_direction);
-       if (call_data->call_number) {
-               dbg("call_number            : %s, ", call_data->call_number);
-       }
-       if (call_data->calling_name) {
-               dbg("calling_name            : %s, ", call_data->calling_name);
-       }
-       dbg("call_type                  : %d, ", call_data->call_type);
-       dbg("call_state                 : %d, ", call_data->call_state);
-       dbg("is_conference          : %d, ", call_data->is_conference);
-       dbg("is_ecc                     : %d, ", call_data->is_ecc);
-       dbg("is_voicemail_number    : %d, ", call_data->is_voicemail_number);
-       dbg("person_id                  : %d", person_id);
-       dbg("start time                 : %ld", call_data->start_time);
-       dbg("\n\n <<<<<<<<< CallData Info in Daemon END >>>>>>>>>> \n");
+       dbg("<<<<<<<<< CallData Info in Daemon START >>>>>>>>>>");
+       dbg("call_id            : %d", call_data->call_id);
+       dbg("call_direction     : %d", call_data->call_direction);
+       if (call_data->call_number)
+               dbg("call_number        : %s", call_data->call_number);
+       if (call_data->calling_name)
+               dbg("calling_name       : %s", call_data->calling_name);
+       dbg("call_type          : %d", call_data->call_type);
+       dbg("call_state         : %s", __callmgr_dbus_convert_call_state_to_string(call_data->call_state));
+       dbg("is_conference      : %d", call_data->is_conference);
+       dbg("is_ecc             : %d", call_data->is_ecc);
+       dbg("is_voicemail_number: %d", call_data->is_voicemail_number);
+       dbg("person_id          : %d", person_id);
+       dbg("start time         : %ld", call_data->start_time);
+       dbg("<<<<<<<<< CallData Info in Daemon END >>>>>>>>>>");
 
        g_variant_builder_init(&b, G_VARIANT_TYPE("a{sv}"));
        g_variant_builder_add(&b, "{sv}", "call_id", g_variant_new_uint32(call_data->call_id));