From: SeokHoon Lee Date: Tue, 12 Sep 2017 01:32:28 +0000 (+0900) Subject: Fix coding rule X-Git-Tag: submit/tizen/20171017.080630~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F03%2F149203%2F1;p=platform%2Fcore%2Fapi%2Fscreen-mirroring.git Fix coding rule Signed-off-by: SeokHoon Lee Change-Id: Ifb6cf40f5a59ce0807655edebf9e814915f0ea22 --- diff --git a/doc/screen_mirroring_doc.h b/doc/screen_mirroring_doc.h index 3a5a7ef..ac7c361 100644 --- a/doc/screen_mirroring_doc.h +++ b/doc/screen_mirroring_doc.h @@ -44,7 +44,7 @@ *
* * - * + * * * * @@ -53,8 +53,8 @@ * * * - * - * + * + * * * * @@ -63,8 +63,8 @@ * * * - * - * + * + * * * * @@ -76,7 +76,7 @@ * * * - * + * * * * @@ -93,15 +93,15 @@ * * * - * + * * - * + * * * * - * + * * - * + * *
FUNCTIONPRE-STATEPRE-STATEPOST-STATESYNC TYPE
NONENULLSYNC
scmirroring_sink_destroy()NULLNONE
scmirroring_sink_prepare()NULLPREPAREDSYNCPREPAREDSYNC
scmirroring_sink_unprepare()scmirroring_sink_connect()PREAREDCONNECTEDASYNCASYNC
scmirroring_sink_start()
scmirroring_sink_pause()PLAYINGPAUSEDPAUSEDASYNC
scmirroring_sink_resume()PAUSEDPLAYINGPLAYINGASYNC
* * diff --git a/include/scmirroring_sink.h b/include/scmirroring_sink.h old mode 100755 new mode 100644 index 78c67e8..769fb95 --- a/include/scmirroring_sink.h +++ b/include/scmirroring_sink.h @@ -319,7 +319,7 @@ int scmirroring_sink_resume(scmirroring_sink_h scmirroring_sink); * @retval #SCMIRRORING_ERROR_UNKNOWN Unknown Error * * @pre The screen mirroring state should be #SCMIRRORING_SINK_STATE_CONNECTED - * or #SCMIRRORING_SINK_STATE_PLAYING or #SCMIRRORING_SINK_STATE_PAUSED + * or #SCMIRRORING_SINK_STATE_PLAYING or #SCMIRRORING_SINK_STATE_PAUSED * @post The screen mirroring state will be #SCMIRRORING_SINK_STATE_DISCONNECTED * * @see scmirroring_sink_create() diff --git a/include/scmirroring_src_ini.h b/include/scmirroring_src_ini.h index 882be60..56893a5 100644 --- a/include/scmirroring_src_ini.h +++ b/include/scmirroring_src_ini.h @@ -99,27 +99,27 @@ typedef struct __scmirroring_src_ini { #define DEFAULT_PROVIDE_CLOCK TRUE #define DEFAULT_VIDEOSRC SCMIRRORING_INI_VSRC_WAYLANDSRC #define DEFAULT_VIDEOENC "omxenc_h264" -#define DEFAULT_VIDEO_BITRATE_INIT_1 1048576 /* bps */ -#define DEFAULT_VIDEO_BITRATE_MIN_1 838861 /* bps */ -#define DEFAULT_VIDEO_BITRATE_MAX_1 1572864 /* bps */ -#define DEFAULT_VIDEO_BITRATE_INIT_2 5242880 /* bps */ -#define DEFAULT_VIDEO_BITRATE_MIN_2 3670016 /* bps */ -#define DEFAULT_VIDEO_BITRATE_MAX_2 6291456 /* bps */ -#define DEFAULT_VIDEO_BITRATE_INIT_3 2621440 /* bps */ -#define DEFAULT_VIDEO_BITRATE_MIN_3 1572864 /* bps */ -#define DEFAULT_VIDEO_BITRATE_MAX_3 3145728 /* bps */ -#define DEFAULT_VIDEO_BITRATE_INIT_4 2621440 /* bps */ -#define DEFAULT_VIDEO_BITRATE_MIN_4 1572864 /* bps */ -#define DEFAULT_VIDEO_BITRATE_MAX_4 3145728 /* bps */ -#define DEFAULT_VIDEO_BITRATE_INIT_5 838861 /* bps */ -#define DEFAULT_VIDEO_BITRATE_MIN_5 314573 /* bps */ -#define DEFAULT_VIDEO_BITRATE_MAX_5 1048576 /* bps */ -#define DEFAULT_VIDEO_BITRATE_INIT_6 838861 /* bps */ -#define DEFAULT_VIDEO_BITRATE_MIN_6 314573 /* bps */ -#define DEFAULT_VIDEO_BITRATE_MAX_6 838861 /* bps */ -#define DEFAULT_VIDEO_BITRATE_INIT_7 1572864 /* bps */ -#define DEFAULT_VIDEO_BITRATE_MIN_7 838861 /* bps */ -#define DEFAULT_VIDEO_BITRATE_MAX_7 1572864 /* bps */ +#define DEFAULT_VIDEO_BITRATE_INIT_1 1048576 /* bps */ +#define DEFAULT_VIDEO_BITRATE_MIN_1 838861 /* bps */ +#define DEFAULT_VIDEO_BITRATE_MAX_1 1572864 /* bps */ +#define DEFAULT_VIDEO_BITRATE_INIT_2 5242880 /* bps */ +#define DEFAULT_VIDEO_BITRATE_MIN_2 3670016 /* bps */ +#define DEFAULT_VIDEO_BITRATE_MAX_2 6291456 /* bps */ +#define DEFAULT_VIDEO_BITRATE_INIT_3 2621440 /* bps */ +#define DEFAULT_VIDEO_BITRATE_MIN_3 1572864 /* bps */ +#define DEFAULT_VIDEO_BITRATE_MAX_3 3145728 /* bps */ +#define DEFAULT_VIDEO_BITRATE_INIT_4 2621440 /* bps */ +#define DEFAULT_VIDEO_BITRATE_MIN_4 1572864 /* bps */ +#define DEFAULT_VIDEO_BITRATE_MAX_4 3145728 /* bps */ +#define DEFAULT_VIDEO_BITRATE_INIT_5 838861 /* bps */ +#define DEFAULT_VIDEO_BITRATE_MIN_5 314573 /* bps */ +#define DEFAULT_VIDEO_BITRATE_MAX_5 1048576 /* bps */ +#define DEFAULT_VIDEO_BITRATE_INIT_6 838861 /* bps */ +#define DEFAULT_VIDEO_BITRATE_MIN_6 314573 /* bps */ +#define DEFAULT_VIDEO_BITRATE_MAX_6 838861 /* bps */ +#define DEFAULT_VIDEO_BITRATE_INIT_7 1572864 /* bps */ +#define DEFAULT_VIDEO_BITRATE_MIN_7 838861 /* bps */ +#define DEFAULT_VIDEO_BITRATE_MAX_7 1572864 /* bps */ #define DEFAULT_MTU_SIZE 1400 /* bytes */ #define DEFAULT_GST_PARAM "" #define DEFAULT_DISABLE_SEGTRAP TRUE diff --git a/miracast_server/miracast_server.h b/miracast_server/miracast_server.h old mode 100755 new mode 100644 index dbe9f91..4a7b4f6 --- a/miracast_server/miracast_server.h +++ b/miracast_server/miracast_server.h @@ -29,7 +29,7 @@ typedef struct _MiracastServerClass MiracastServerClass; #define MIRACAST_SERVER_TYPE_OBJECT (miracast_server_get_type()) #define MIRACAST_SERVER(object) (G_TYPE_CHECK_INSTANCE_CAST \ - ((object), MIRACAST_SERVER_TYPE_OBJECT, MiracastServer)) + ((object), MIRACAST_SERVER_TYPE_OBJECT, MiracastServer)) #define MIRACAST_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), MIRACAST_SERVER_TYPE_OBJECT, MiracastServerClass)) #define MIRACAST_SERVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), MIRACAST_SERVER_TYPE_OBJECT, MiracastServerClass)) #define MIRACAST_SERVER_CAST(obj) ((MiracastServer*)(obj)) @@ -57,11 +57,11 @@ struct _MiracastServer { struct _MiracastServerClass { GObjectClass parent; - void (*interpret) (MiracastServer *server, gchar *buf); - int (*send_response) (MiracastServer *server, const gchar *cmd); - int (*server_start) (MiracastServer *server); - void (*quit_server) (MiracastServer *server); - gboolean (*server_setup) (MiracastServer *server); + void (*interpret) (MiracastServer *server, gchar *buf); + int (*send_response) (MiracastServer *server, const gchar *cmd); + int (*server_start) (MiracastServer *server); + void (*quit_server) (MiracastServer *server); + gboolean(*server_setup) (MiracastServer *server); gpointer _gst_reserved[GST_PADDING_LARGE - 1]; }; diff --git a/packaging/capi-media-screen-mirroring.spec b/packaging/capi-media-screen-mirroring.spec index d2bf212..8d7cfa0 100644 --- 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.86 +Version: 0.1.87 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/scmirroring_sink_internal.c b/src/scmirroring_sink_internal.c index 63ddc2d..83d5517 100644 --- a/src/scmirroring_sink_internal.c +++ b/src/scmirroring_sink_internal.c @@ -114,4 +114,4 @@ int scmirroring_sink_get_state(scmirroring_sink_h scmirroring_sink, scmirroring_ scmirroring_debug_fleave(); return __scmirroring_sink_error_convert(__func__, result); -} \ No newline at end of file +} diff --git a/test/scmirroring_test.c b/test/scmirroring_test.c index 65f440e..c76a036 100644 --- a/test/scmirroring_test.c +++ b/test/scmirroring_test.c @@ -82,9 +82,8 @@ int _scmirroring_src_create(void) g_print("Set state Changed callback function\n"); ret = scmirroring_src_set_state_changed_cb(g_scmirroring, scmirroring_state_callback, NULL); - if (ret != SCMIRRORING_ERROR_NONE) { + if (ret != SCMIRRORING_ERROR_NONE) g_print("Failed to set state changed callback\n"); - } return ret; } diff --git a/test_sink/scmirroring_sink_test.c b/test_sink/scmirroring_sink_test.c index 6fd8dc2..80158e3 100644 --- a/test_sink/scmirroring_sink_test.c +++ b/test_sink/scmirroring_sink_test.c @@ -828,9 +828,8 @@ static void __interpret(char *cmd) ret = __wifi_direct_device_connect(); } #endif - else { + else g_print("unknown menu \n"); - } if (ret != SCMIRRORING_ERROR_NONE) g_print("Error Occured [%d]", ret); diff --git a/test_sink/scmirroring_sink_test_SBS.c b/test_sink/scmirroring_sink_test_SBS.c index 321d9bf..cf8da4b 100644 --- a/test_sink/scmirroring_sink_test_SBS.c +++ b/test_sink/scmirroring_sink_test_SBS.c @@ -499,15 +499,15 @@ static void scmirroring_sink_state_callback(scmirroring_error_e error_code, scmi g_print(" state[%d] SCMIRRORING_SINK_STATE_NULL\n", state); else if (state == SCMIRRORING_SINK_STATE_PREPARED) g_print(" state[%d] SCMIRRORING_SINK_STATE_PREPARED\n", state); - else if (state == SCMIRRORING_SINK_STATE_CONNECTED) { + else if (state == SCMIRRORING_SINK_STATE_CONNECTED) g_print(" state[%d] SCMIRRORING_SINK_STATE_CONNECTED\n", state); - } else if (state == SCMIRRORING_SINK_STATE_PLAYING) + else if (state == SCMIRRORING_SINK_STATE_PLAYING) g_print(" state[%d] SCMIRRORING_SINK_STATE_PLAYING\n", state); else if (state == SCMIRRORING_SINK_STATE_PAUSED) g_print(" state[%d] SCMIRRORING_SINK_STATE_PAUSED\n", state); - else if (state == SCMIRRORING_SINK_STATE_DISCONNECTED) { + else if (state == SCMIRRORING_SINK_STATE_DISCONNECTED) g_print(" state[%d] SCMIRRORING_SINK_STATE_DISCONNECTED\n", state); - } else + else g_print(" state[%d] Invalid State", state); return; @@ -836,9 +836,8 @@ static void __interpret(char *cmd) ret = __wifi_direct_device_connect(); } #endif - else { + else g_print("unknown menu \n"); - } if (ret != SCMIRRORING_ERROR_NONE) g_print("Error Occured [%d]", ret);