From: Haejeong, Kim Date: Thu, 29 Oct 2015 04:19:40 +0000 (+0900) Subject: Apply tizen coding rule X-Git-Tag: submit/tizen/20151030.021244^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=088bba53b25a68bd53534591dc8feaa09d52d8c3;p=platform%2Fcore%2Fapi%2Fscreen-mirroring.git Apply tizen coding rule Change-Id: If74345b1cdd26ace937ddc1332d0875727c6594d --- diff --git a/miracast_server/miracast_server_impl.c b/miracast_server/miracast_server_impl.c old mode 100644 new mode 100755 index f586a1f..23640dc --- a/miracast_server/miracast_server_impl.c +++ b/miracast_server/miracast_server_impl.c @@ -72,26 +72,26 @@ static GDBusNodeInfo *introspection_data = NULL; /* Introspection data for the service we are exporting */ static const gchar introspection_xml[] = - "" - " " - " " - " " - " " - " " - " " - " " - ""; + "" + " " + " " + " " + " " + " " + " " + " " + ""; static void handle_method_call(GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, - const gchar *interface_name, - const gchar *method_name, - GVariant *parameters, - GDBusMethodInvocation *invocation, - gpointer user_data) + const gchar *sender, + const gchar *object_path, + const gchar *interface_name, + const gchar *method_name, + GVariant *parameters, + GDBusMethodInvocation *invocation, + gpointer user_data) { scmirroring_debug("handle_method_call is called\n"); @@ -115,36 +115,27 @@ static const GDBusInterfaceVTable interface_vtable = { {NULL} }; -static void -on_bus_acquired(GDBusConnection *connection, - const gchar *name, - gpointer user_data) +static void on_bus_acquired(GDBusConnection *connection, const gchar *name, gpointer user_data) { guint registration_id; scmirroring_debug("on_bus_acquired called\n"); registration_id = g_dbus_connection_register_object(connection, - PROC_DBUS_OBJECT, - introspection_data->interfaces[0], - &interface_vtable, - NULL, - NULL, /* user_data_free_func */ - NULL); /* GError** */ + PROC_DBUS_OBJECT, + introspection_data->interfaces[0], + &interface_vtable, + NULL, + NULL, /* user_data_free_func */ + NULL); /* GError** */ g_assert(registration_id > 0); } -static void -on_name_acquired(GDBusConnection *connection, - const gchar *name, - gpointer user_data) +static void on_name_acquired(GDBusConnection *connection, const gchar *name, gpointer user_data) { scmirroring_debug("on_name_acquired called\n"); } -static void -on_name_lost(GDBusConnection *connection, - const gchar *name, - gpointer user_data) +static void on_name_lost(GDBusConnection *connection, const gchar *name, gpointer user_data) { scmirroring_debug("on_name_lost called\n"); } @@ -341,13 +332,13 @@ static gboolean __miracast_server_setup(MiracastServer* server) } g_bus_own_name(G_BUS_TYPE_SYSTEM, - PROC_DBUS_INTERFACE, - G_BUS_NAME_OWNER_FLAGS_NONE, - on_bus_acquired, - on_name_acquired, - on_name_lost, - G_OBJECT(server), - NULL); + PROC_DBUS_INTERFACE, + G_BUS_NAME_OWNER_FLAGS_NONE, + on_bus_acquired, + on_name_acquired, + on_name_lost, + G_OBJECT(server), + NULL); __miracast_server_set_signal(); scmirroring_debug("__miracast_server_setup end\n"); @@ -535,9 +526,7 @@ __teardown_req(GstRTSPClient *client, GstRTSPContext *ctx) return; } -static void -__miracast_server_client_connected_cb(GstRTSPServer *server, - GstRTSPClient *client, gpointer user_data) +static void __miracast_server_client_connected_cb(GstRTSPServer *server, GstRTSPClient *client, gpointer user_data) { MiracastServer *server_obj = (MiracastServer *)user_data; MiracastServerClass *klass; @@ -591,20 +580,20 @@ int __miracast_server_start(MiracastServer *server_obj) factory = gst_rtsp_media_factory_wfd_new(); gst_rtsp_media_factory_wfd_set(factory, - scmirroring_src_ini_get_structure()->videosrc_element, - scmirroring_src_ini_get_structure()->name_of_audio_device, - scmirroring_src_ini_get_structure()->audio_latency_time, - scmirroring_src_ini_get_structure()->audio_buffer_time, - scmirroring_src_ini_get_structure()->audio_do_timestamp, - scmirroring_src_ini_get_structure()->mtu_size + scmirroring_src_ini_get_structure()->videosrc_element, + scmirroring_src_ini_get_structure()->name_of_audio_device, + scmirroring_src_ini_get_structure()->audio_latency_time, + scmirroring_src_ini_get_structure()->audio_buffer_time, + scmirroring_src_ini_get_structure()->audio_do_timestamp, + scmirroring_src_ini_get_structure()->mtu_size ); - gst_rtsp_media_factory_wfd_set_encoders (factory, + gst_rtsp_media_factory_wfd_set_encoders(factory, scmirroring_src_ini_get_structure()->name_of_video_encoder, scmirroring_src_ini_get_structure()->name_of_audio_encoder_aac, scmirroring_src_ini_get_structure()->name_of_audio_encoder_ac3); - gst_rtsp_wfd_server_set_audio_codec (server, + gst_rtsp_wfd_server_set_audio_codec(server, scmirroring_src_ini_get_structure()->audio_codec); if (server_obj->resolution == SCMIRRORING_RESOLUTION_1920x1080_P30) { @@ -630,12 +619,10 @@ int __miracast_server_start(MiracastServer *server_obj) gst_rtsp_wfd_server_set_supported_reso(server, GST_WFD_HH_640x360P30); } else { gst_rtsp_wfd_server_set_video_native_reso(server, GST_WFD_VIDEO_CEA_RESOLUTION); - gst_rtsp_wfd_server_set_supported_reso(server, - scmirroring_src_ini_get_structure()->video_reso_supported); + gst_rtsp_wfd_server_set_supported_reso(server, scmirroring_src_ini_get_structure()->video_reso_supported); } - gst_rtsp_media_factory_wfd_set_dump_ts(factory, - scmirroring_src_ini_get_structure()->dump_ts); + gst_rtsp_media_factory_wfd_set_dump_ts(factory, scmirroring_src_ini_get_structure()->dump_ts); g_object_ref(factory); gst_rtsp_mount_points_add_factory(mounts, TEST_MOUNT_POINT, GST_RTSP_MEDIA_FACTORY(factory)); @@ -645,8 +632,7 @@ int __miracast_server_start(MiracastServer *server_obj) if ((id = gst_rtsp_server_attach(GST_RTSP_SERVER_CAST(server), NULL)) == 0) goto failed; - g_signal_connect(server, "client-connected", - G_CALLBACK(__miracast_server_client_connected_cb), server_obj); + g_signal_connect(server, "client-connected", G_CALLBACK(__miracast_server_client_connected_cb), server_obj); server_obj->server = (void *) server; server_obj->factory = (void *) factory; @@ -750,18 +736,16 @@ int __miracast_server_accept(int serv_sock, int *client_sock) char buf[255] = {0, }; strerror_r(errno, buf, sizeof(buf)); scmirroring_error("accept failed : %s", buf); - *client_sock = -1; + *client_sock = -1; return SCMIRRORING_ERROR_INVALID_OPERATION; } - *client_sock = sockfd; + *client_sock = sockfd; return SCMIRRORING_ERROR_NONE; } -gboolean __miracast_server_client_read_cb(GIOChannel *src, - GIOCondition condition, - gpointer data) +gboolean __miracast_server_client_read_cb(GIOChannel *src, GIOCondition condition, gpointer data) { char buf[MAX_MSG_LEN + 1]; gsize read; @@ -808,9 +792,7 @@ gboolean __miracast_server_client_read_cb(GIOChannel *src, } -gboolean __miracast_server_read_cb(GIOChannel *src, - GIOCondition condition, - gpointer data) +gboolean __miracast_server_read_cb(GIOChannel *src, GIOCondition condition, gpointer data) { MiracastServer *server = (MiracastServer *)data; @@ -882,8 +864,8 @@ static int __miracast_server_emit_status_signal(int status) } ret = g_dbus_connection_emit_signal(conn, - NULL, PROC_DBUS_OBJECT, PROC_DBUS_INTERFACE, PROC_DBUS_STATUS_CHANGE_SIGNAL, - g_variant_new("(i)", status), &err); + NULL, PROC_DBUS_OBJECT, PROC_DBUS_INTERFACE, PROC_DBUS_STATUS_CHANGE_SIGNAL, + g_variant_new("(i)", status), &err); if (!ret && err) { scmirroring_error("g_dbus_connection_emit_signal() error(%s) ", err->message); goto error; @@ -897,7 +879,7 @@ static int __miracast_server_emit_status_signal(int status) g_object_unref(conn); scmirroring_debug("sending miracast server status [%s] success", - (status == MIRACAST_WFD_SOURCE_ON) ? "On" : "Off"); + (status == MIRACAST_WFD_SOURCE_ON) ? "On" : "Off"); g_server_status = status; @@ -909,14 +891,12 @@ error: return -1; } -MiracastServer* -miracast_server_new (void) +MiracastServer* miracast_server_new(void) { - return g_object_new (MIRACAST_SERVER_TYPE_OBJECT, NULL); + return g_object_new(MIRACAST_SERVER_TYPE_OBJECT, NULL); } -gboolean -miracast_server_setup(MiracastServer *server, GMainLoop *mainloop) +gboolean miracast_server_setup(MiracastServer *server, GMainLoop *mainloop) { int sockfd = -1; diff --git a/packaging/capi-media-screen-mirroring.spec b/packaging/capi-media-screen-mirroring.spec index fb300c3..a8675c4 100755 --- a/packaging/capi-media-screen-mirroring.spec +++ b/packaging/capi-media-screen-mirroring.spec @@ -1,6 +1,6 @@ Name: capi-media-screen-mirroring Summary: A screen mirroring library in Tizen C API -Version: 0.1.43 +Version: 0.1.44 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/scmirroring_sink.c b/src/scmirroring_sink.c index cc2ceb8..435e3c8 100755 --- a/src/scmirroring_sink.c +++ b/src/scmirroring_sink.c @@ -329,7 +329,7 @@ int scmirroring_sink_set_state_changed_cb(scmirroring_sink_h scmirroring_sink, s } handle->scmirroring_sink_state_cb->user_data = user_data; - handle->scmirroring_sink_state_cb->state_cb = callback; + handle->scmirroring_sink_state_cb->state_cb = callback; ret = mm_wfd_sink_set_message_callback(handle->mm_handle, __mm_scmirroring_sink_set_message_cb, handle); diff --git a/src/scmirroring_src.c b/src/scmirroring_src.c index 1f43279..0a680e2 100755 --- a/src/scmirroring_src.c +++ b/src/scmirroring_src.c @@ -50,7 +50,7 @@ static gboolean __scmirroring_src_callback_call(gpointer data) SCMIRRORING_SAFE_FREE(scmirroring->port); SCMIRRORING_SAFE_FREE(scmirroring->scmirroring_state_cb); - g_io_channel_shutdown(scmirroring->channel, FALSE, NULL); + g_io_channel_shutdown(scmirroring->channel, FALSE, NULL); g_io_channel_unref(scmirroring->channel); SCMIRRORING_SAFE_FREE(scmirroring->sock_path); @@ -120,16 +120,16 @@ static int __miracast_server_launch(scmirroring_src_s *scmirroring) obj_path = g_strdup("/org/tizen/scmirroring/server"); } - scmirroring_debug ("Server Name : %s", name); + scmirroring_debug("Server Name : %s", name); proxy = g_dbus_proxy_new_sync(conn, - G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS, - NULL, - name, - obj_path, - if_name, - NULL, - &error); + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS, + NULL, + name, + obj_path, + if_name, + NULL, + &error); g_free(name); g_free(if_name); g_free(obj_path); @@ -554,8 +554,7 @@ int scmirroring_src_connect(scmirroring_src_h scmirroring) scmirroring_debug_fenter(); scmirroring_retvm_if(_scmirroring == NULL, SCMIRRORING_ERROR_INVALID_PARAMETER, "Handle is NULL"); - scmirroring_retvm_if(_scmirroring->connected == CONNECTED_TO_SERVER, SCMIRRORING_ERROR_INVALID_OPERATION, - "INVALID OPERATION, already connected to server."); + scmirroring_retvm_if(_scmirroring->connected == CONNECTED_TO_SERVER, SCMIRRORING_ERROR_INVALID_OPERATION, "INVALID OPERATION, already connected to server."); /*Create TCP Socket*/ if ((sock = socket(PF_FILE, SOCK_STREAM, 0)) < 0) { diff --git a/src/scmirroring_src_ini.c b/src/scmirroring_src_ini.c index d0fd1ae..b607723 100755 --- a/src/scmirroring_src_ini.c +++ b/src/scmirroring_src_ini.c @@ -29,20 +29,19 @@ static void __scmirroring_ini_check_ini_status(void); /* macro */ #define SCMIRRORING_INI_GET_STRING(x_item, x_ini, x_default) \ -do \ -{ \ +do { \ gchar* str = NULL; \ gint length = 0; \ str = iniparser_getstring(dict, x_ini, (char *)x_default); \ - if ( str ) { \ - length = strlen (str); \ - if(( length > 1 ) && ( length < SCMIRRORING_SRC_INI_MAX_STRLEN ) ) \ - strncpy ( x_item, str, length + 1); \ + if (str) { \ + length = strlen(str); \ + if ((length > 1) && (length < SCMIRRORING_SRC_INI_MAX_STRLEN)) \ + strncpy(x_item, str, length + 1); \ else \ - strncpy ( x_item, x_default, SCMIRRORING_SRC_INI_MAX_STRLEN - 1); \ + strncpy(x_item, x_default, SCMIRRORING_SRC_INI_MAX_STRLEN - 1); \ } \ else { \ - strncpy ( x_item, x_default, SCMIRRORING_SRC_INI_MAX_STRLEN - 1); \ + strncpy(x_item, x_default, SCMIRRORING_SRC_INI_MAX_STRLEN - 1); \ } \ } while (0); diff --git a/test_sink/scmirroring_sink_test.c b/test_sink/scmirroring_sink_test.c index 5a73123..4c15375 100755 --- a/test_sink/scmirroring_sink_test.c +++ b/test_sink/scmirroring_sink_test.c @@ -42,8 +42,8 @@ static void _win_del(void *data, Evas_Object *obj, void *event); static gboolean _scmirroring_start_jobs(gpointer data); struct appcore_ops ops = { - .create = app_create, - .terminate = app_terminate, + .create = app_create, + .terminate = app_terminate, }; static Evas_Object* g_evas; static Evas_Object* g_eo = NULL; @@ -72,16 +72,16 @@ static gboolean __start_p2p_connection(gpointer data); static gboolean __disconnect_p2p_connection(void); #endif static void __quit_program(void); -gboolean __timeout_menu_display(void *data); +gboolean __timeout_menu_display(void *data); /* Submenu for setting resolution */ static void __display_resolution_submenu(void); -gboolean __timeout_resolution_submenu_display(void *data); +gboolean __timeout_resolution_submenu_display(void *data); static void __interpret_resolution_submenu(char *cmd); /* Submenu for getting negotiated audio and video information */ static void __display_stream_info_submenu(void); -gboolean __timeout_stream_info_submenu_display(void *data); +gboolean __timeout_stream_info_submenu_display(void *data); static void __interpret_stream_info_submenu(char *cmd); /* Submenu for setting sink type */ @@ -99,14 +99,13 @@ static Evas_Object* _create_win(const char *name) { Evas_Object *eo = NULL; - g_printf ("[%s][%d] name=%s\n", __func__, __LINE__, name); + g_printf("[%s][%d] name=%s\n", __func__, __LINE__, name); eo = elm_win_add(NULL, name, ELM_WIN_BASIC); - if (eo) - { + if (eo) { elm_win_title_set(eo, name); elm_win_borderless_set(eo, EINA_TRUE); - evas_object_smart_callback_add(eo, "delete,request",_win_del, NULL); + evas_object_smart_callback_add(eo, "delete,request", _win_del, NULL); elm_win_autodel_set(eo, EINA_TRUE); } return eo; @@ -114,7 +113,7 @@ static Evas_Object* _create_win(const char *name) static Evas_Object *create_evas_image_object(Evas_Object *eo_parent) { - if(!eo_parent) { + if (!eo_parent) { return NULL; } Evas *evas = evas_object_evas_get(eo_parent); @@ -143,7 +142,7 @@ static int app_create(void *data) evas_object_show(win); result = _scmirroring_start_jobs((void *)NULL); - if(result != TRUE){ + if (result != TRUE) { g_print("failed _scmirroring_start_jobs "); } @@ -154,12 +153,12 @@ static int app_create(void *data) } static int app_terminate(void *data) { + if (g_evas) { + evas_object_del(g_evas); + g_evas = NULL; + } - if (g_evas) { - evas_object_del(g_evas); - g_evas = NULL; - } - return 0; + return 0; } gboolean __timeout_sink_submenu_display(void *data) @@ -172,10 +171,10 @@ static void __display_sink_submenu(void) { g_print("\n"); g_print("**********************************************************************\n"); - g_print(" Setting sink \n"); + g_print(" Setting sink \n"); g_print("**********************************************************************\n"); - g_print("1 : SCMIRRORING_DISPLAY_TYPE_OVERLAY with No Surface(DEFAULT)\n" ); - g_print("2 : SCMIRRORING_DISPLAY_TYPE_OVERLAY with Surface\n" ); + g_print("1 : SCMIRRORING_DISPLAY_TYPE_OVERLAY with No Surface(DEFAULT)\n"); + g_print("2 : SCMIRRORING_DISPLAY_TYPE_OVERLAY with Surface\n"); g_print("3 : SCMIRRORING_DISPLAY_TYPE_EVAS\n"); g_print("g : Go back to main menu \n"); g_print("**********************************************************************\n"); @@ -215,7 +214,7 @@ static void __display_resolution_submenu(void) { g_print("\n"); g_print("**********************************************************************\n"); - g_print(" Setting resolution \n"); + g_print(" Setting resolution \n"); g_print("**********************************************************************\n"); g_print("1 : SCMIRRORING_RESOLUTION_1920x1080_P30 [%d]\n", SCMIRRORING_RESOLUTION_1920x1080_P30); g_print("2 : SCMIRRORING_RESOLUTION_1280x720_P30 [%d]\n", SCMIRRORING_RESOLUTION_1280x720_P30); @@ -279,7 +278,7 @@ static void __display_stream_info_submenu(void) { g_print("\n"); g_print("**********************************************************************\n"); - g_print(" Getting negotiated audio and video information \n"); + g_print(" Getting negotiated audio and video information \n"); g_print("**********************************************************************\n"); g_print("1 : video codec\n"); g_print("2 : video resolution\n"); @@ -444,11 +443,11 @@ static void __displaymenu(void) { g_print("\n"); g_print("=====================================================================\n"); - g_print(" SCMIRRORING Sink Testsuite(press q to quit) \n"); + g_print(" SCMIRRORING Sink Testsuite(press q to quit) \n"); g_print("=====================================================================\n"); #ifndef TEST_WITH_WIFI_DIRECT g_print("a : a ip port(ex. a 192.168.49.1 2022)\n"); - g_print("s : start \n"); + g_print("s : start \n"); #endif g_print("P : Pause\n"); g_print("R : Resume\n"); @@ -511,7 +510,7 @@ void _activation_cb(int error_code, wifi_direct_device_state_e device_state, voi g_print("__start_wifi_display_connection fail\n"); g_print("Quit Program\n"); ret = wifi_direct_deinitialize(); - if(ret != WIFI_DIRECT_ERROR_NONE) + if (ret != WIFI_DIRECT_ERROR_NONE) g_print("wifi_direct_deinitialize is failed\n"); g_scmirroring = 0; @@ -697,7 +696,7 @@ static gboolean __start_wifi_display_connection() wifi_direct_state_e direct_state = WIFI_DIRECT_STATE_DEACTIVATED; gint ret = FALSE; - if(is_initialized == TRUE) + if (is_initialized == TRUE) return TRUE; is_initialized = TRUE; @@ -771,7 +770,7 @@ static gboolean __start_wifi_display_connection() g_print("Error : Direct not activated yet\n"); } - g_print("====== p2p connection established ======\n"); + g_print("====== p2p connection established ======\n"); return TRUE; } @@ -793,28 +792,28 @@ static gboolean __start_p2p_connection(gpointer data) struct ug_data *ugd = (struct ug_data *)data; /* Activation / Deactivation state Callback */ - ret = wifi_direct_set_device_state_changed_cb(_activation_cb, (void *)ugd); + ret = wifi_direct_set_device_state_changed_cb(_activation_cb, (void *)ugd); if (ret != WIFI_DIRECT_ERROR_NONE) { g_print("Error : wifi_direct_set_device_state_changed_cb failed : %d\n", ret); goto error; } /* Discovery state Callback */ - ret = wifi_direct_set_discovery_state_changed_cb(_discover_cb, (void *)ugd); + ret = wifi_direct_set_discovery_state_changed_cb(_discover_cb, (void *)ugd); if (ret != WIFI_DIRECT_ERROR_NONE) { g_print("Error : wifi_direct_set_discovery_state_changed_cb failed : %d\n", ret); goto error; } /* Connection state Callback */ - ret = wifi_direct_set_connection_state_changed_cb(_connection_cb, (void *)ugd); + ret = wifi_direct_set_connection_state_changed_cb(_connection_cb, (void *)ugd); if (ret != WIFI_DIRECT_ERROR_NONE) { g_print("Error : wifi_direct_set_connection_state_changed_cb failed : %d\n", ret); goto error; } /* IP address assigning state callback */ - ret = wifi_direct_set_client_ip_address_assigned_cb(_ip_assigned_cb, (void *)ugd); + ret = wifi_direct_set_client_ip_address_assigned_cb(_ip_assigned_cb, (void *)ugd); if (ret != WIFI_DIRECT_ERROR_NONE) { g_print("Error : wifi_direct_set_client_ip_address_assigned_cb failed : %d\n", ret); goto error; @@ -920,13 +919,11 @@ gboolean __scmirroring_sink_start(gpointer data) } } - if(g_sinktype != -1) { - - - if(g_sinktype == SCMIRRORING_DISPLAY_TYPE_OVERLAY) { + if (g_sinktype != -1) { + if (g_sinktype == SCMIRRORING_DISPLAY_TYPE_OVERLAY) { evas_object_show(g_evas); ret = scmirroring_sink_set_display(g_scmirroring, SCMIRRORING_DISPLAY_TYPE_OVERLAY, (void *)g_evas); - } else if(g_sinktype == SCMIRRORING_DISPLAY_TYPE_EVAS) { + } else if (g_sinktype == SCMIRRORING_DISPLAY_TYPE_EVAS) { g_eo = create_evas_image_object(g_evas); evas_object_image_size_set(g_eo, 800, 1200);