diff options
author | Seungha Son <seungha.son@samsung.com> | 2017-08-17 09:28:46 +0900 |
---|---|---|
committer | Seungha Son <seungha.son@samsung.com> | 2017-08-31 09:14:36 +0900 |
commit | 04e7b01d2f5a31d1ec0ceb2ce58201effdd0b29f (patch) | |
tree | 633b72f180c5e2947e0cb93b8664435726bd3289 /src | |
parent | 4c9f6554fc7c544facf71422a2b4116aac9718cd (diff) | |
download | minicontrol-04e7b01d2f5a31d1ec0ceb2ce58201effdd0b29f.tar.gz minicontrol-04e7b01d2f5a31d1ec0ceb2ce58201effdd0b29f.tar.bz2 minicontrol-04e7b01d2f5a31d1ec0ceb2ce58201effdd0b29f.zip |
Add minicontrol featuresubmit/tizen_4.0/20170904.030057accepted/tizen/4.0/unified/20170904.143846
Signed-off-by: Seungha Son <seungha.son@samsung.com>
Change-Id: I4df3905b370a8e6b6d8476883306ab1cb8046158
Diffstat (limited to 'src')
-rwxr-xr-x | src/minicontrol-provider.c | 10 | ||||
-rwxr-xr-x | src/minicontrol-viewer.c | 14 |
2 files changed, 24 insertions, 0 deletions
diff --git a/src/minicontrol-provider.c b/src/minicontrol-provider.c index bf3e793..c0c8120 100755 --- a/src/minicontrol-provider.c +++ b/src/minicontrol-provider.c @@ -23,6 +23,7 @@ #include "minicontrol-provider.h" #include "minicontrol-provider-internal.h" #include "minicontrol-log.h" +#include "minicontrol-private.h" #define MINICTRL_PRIORITY_SUFFIX_TOP "__minicontrol_top" #define MINICTRL_PRIORITY_SUFFIX_LOW "__minicontrol_low" @@ -157,6 +158,8 @@ EXPORT_API Evas_Object *minicontrol_create_window(const char *name, char *name_inter; struct _minicontrol_provider *pd; + CHECK_MINICONTROL_FEATURE_RET_NULL(); + if (!name) { ERR("invalid parameter"); set_last_result(MINICONTROL_ERROR_INVALID_PARAMETER); @@ -230,6 +233,7 @@ EXPORT_API Evas_Object *minicontrol_create_window(const char *name, pd->event_callback = event_callback; INFO("new minicontrol created - %s", pd->name); + set_last_result(MINICONTROL_ERROR_NONE); return win; } @@ -239,6 +243,8 @@ EXPORT_API int minicontrol_send_event(Evas_Object *minicontrol, struct _minicontrol_provider *pd; int ret = MINICONTROL_ERROR_NONE; + CHECK_MINICONTROL_FEATURE(); + if (!minicontrol) { ERR("minicontrol is NULL, invaild parameter"); return MINICONTROL_ERROR_INVALID_PARAMETER; @@ -393,6 +399,8 @@ EXPORT_API Evas_Object *minicontrol_win_add(const char *name) char *name_inter = NULL; struct _minicontrol_provider *pd; + CHECK_MINICONTROL_FEATURE_RET_NULL(); + INFO("minicontrol_win_add [%s]", name); if (!name) { @@ -463,6 +471,8 @@ EXPORT_API int minicontrol_request(Evas_Object *minicontrol, struct _minicontrol_provider *pd; minicontrol_event_e event; + CHECK_MINICONTROL_FEATURE(); + if (!minicontrol) { ERR("minicontrol is NULL, invaild parameter"); return MINICONTROL_ERROR_INVALID_PARAMETER; diff --git a/src/minicontrol-viewer.c b/src/minicontrol-viewer.c index a3a5ed7..8183372 100755 --- a/src/minicontrol-viewer.c +++ b/src/minicontrol-viewer.c @@ -22,6 +22,7 @@ #include "minicontrol-viewer.h" #include "minicontrol-viewer-internal.h" #include "minicontrol-log.h" +#include "minicontrol-private.h" #define MINICTRL_PLUG_DATA_KEY "__minictrl_plug_name" @@ -38,6 +39,8 @@ EXPORT_API int minicontrol_viewer_send_event(const char *minicontrol_name, { int ret = MINICONTROL_ERROR_NONE; + CHECK_MINICONTROL_FEATURE(); + if (minicontrol_name == NULL) { ERR("appid is NULL, invaild parameter"); return MINICONTROL_ERROR_INVALID_PARAMETER; @@ -87,6 +90,8 @@ EXPORT_API int minicontrol_viewer_set_event_cb( minictrl_sig_handle *event_sh; struct _minicontrol_viewer *minicontrol_viewer_h; + CHECK_MINICONTROL_FEATURE(); + if (!callback) { ERR("MINICONTROL_ERROR_INVALID_PARAMETER"); return MINICONTROL_ERROR_INVALID_PARAMETER; @@ -129,6 +134,8 @@ EXPORT_API int minicontrol_viewer_set_event_cb( EXPORT_API int minicontrol_viewer_unset_event_cb(void) { + CHECK_MINICONTROL_FEATURE(); + if (!g_minicontrol_viewer_h) return MINICONTROL_ERROR_NONE; @@ -197,6 +204,8 @@ EXPORT_API Evas_Object *minicontrol_viewer_add(Evas_Object *parent, Evas_Object *plug_img = NULL; Ecore_Evas *ee = NULL; + CHECK_MINICONTROL_FEATURE_RET_NULL(); + if (parent == NULL || minicontrol_name == NULL) { ERR("invalid parameter"); set_last_result(MINICONTROL_ERROR_INVALID_PARAMETER); @@ -231,6 +240,7 @@ EXPORT_API Evas_Object *minicontrol_viewer_add(Evas_Object *parent, evas_object_event_callback_add(plug, EVAS_CALLBACK_DEL, _minictrl_plug_del, ee); + set_last_result(MINICONTROL_ERROR_NONE); return plug; } @@ -238,6 +248,8 @@ EXPORT_API Evas_Object *minicontrol_viewer_add(Evas_Object *parent, EXPORT_API Evas_Object *minicontrol_viewer_image_object_get( const Evas_Object *obj) { + CHECK_MINICONTROL_FEATURE_RET_NULL(); + return elm_plug_image_object_get(obj); } /* LCOV_EXCL_STOP */ @@ -250,6 +262,8 @@ EXPORT_API int minicontrol_viewer_request(const char *minicontrol_name, bundle *event_arg_bundle; char bundle_value_buffer[BUNDLE_BUFFER_LENGTH]; + CHECK_MINICONTROL_FEATURE(); + if (minicontrol_name == NULL) { ERR("appid is NULL, invaild parameter"); return MINICONTROL_ERROR_INVALID_PARAMETER; |