From: Sung-jae Park Date: Mon, 25 Mar 2013 04:06:49 +0000 (+0000) Subject: Update License X-Git-Tag: 2.1b_release~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4de3ca0b85bcf6c08d10b23a53ec08b9ac1f420;p=apps%2Flivebox%2Flivebox.git Update License 2012 -> 2013 Change-Id: I3eb61af344a9f22e7f45abc0019b3c3bec6fbd0e --- diff --git a/CMakeLists.txt b/CMakeLists.txt index c078e9d..66ae402 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,8 +37,6 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -g") ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"") ADD_DEFINITIONS("-DLOG_TAG=\"LIVEBOX\"") ADD_DEFINITIONS("-DNDEBUG") -ADD_DEFINITIONS("-DMASTER_PKGNAME=\"org.tizen.data-provider-master\"") -ADD_DEFINITIONS("-DSLAVE_PKGNAME=\"org.tizen.data-provider-slave\"") ADD_LIBRARY(${PROJECT_NAME} SHARED src/dlist.c diff --git a/LICENSE b/LICENSE index 27daa90..009765e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ Flora License -Version 1.0, May, 2012 +Version 1.0, May, 2013 http://www.tizenopensource.org/license diff --git a/include/debug.h b/include/debug.h index 925dd47..5af77f5 100644 --- a/include/debug.h +++ b/include/debug.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 Samsung Electronics Co., Ltd * * Licensed under the Flora License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/include/dlist.h b/include/dlist.h index a0ad1a0..71008f8 100644 --- a/include/dlist.h +++ b/include/dlist.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 Samsung Electronics Co., Ltd * * Licensed under the Flora License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/include/livebox.h b/include/livebox.h index 0d3b24a..4a6b145 100644 --- a/include/livebox.h +++ b/include/livebox.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 Samsung Electronics Co., Ltd * * Licensed under the Flora License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/include/livebox_PG.h b/include/livebox_PG.h index 62077ae..d262be8 100644 --- a/include/livebox_PG.h +++ b/include/livebox_PG.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 Samsung Electronics Co., Ltd * * Licensed under the Flora License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/include/util.h b/include/util.h index 85abafa..b1a3576 100644 --- a/include/util.h +++ b/include/util.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 Samsung Electronics Co., Ltd * * Licensed under the Flora License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/packaging/liblivebox.spec b/packaging/liblivebox.spec index 7a7faac..a79e08f 100644 --- a/packaging/liblivebox.spec +++ b/packaging/liblivebox.spec @@ -1,8 +1,8 @@ Name: liblivebox Summary: Library for the development of a livebox -Version: 0.1.17 +Version: 0.1.19 Release: 1 -Group: main/app +Group: HomeTF/Livebox License: Flora License Source0: %{name}-%{version}.tar.gz BuildRequires: cmake, gettext-tools, coreutils diff --git a/src/dlist.c b/src/dlist.c index 90a7492..991837a 100644 --- a/src/dlist.c +++ b/src/dlist.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 Samsung Electronics Co., Ltd * * Licensed under the Flora License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/livebox.c b/src/livebox.c index 5e19696..ce03eba 100644 --- a/src/livebox.c +++ b/src/livebox.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 Samsung Electronics Co., Ltd * * Licensed under the Flora License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ #include #include #include +#include #include "debug.h" #include "livebox.h" @@ -131,7 +132,7 @@ EAPI int livebox_desc_close(struct livebox_desc *handle) struct block *block; if (!handle) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; DbgPrint("Close and flush\n"); dlist_foreach_safe(handle->block_list, l, n, block) { @@ -183,7 +184,7 @@ EAPI int livebox_desc_close(struct livebox_desc *handle) fclose(handle->fp); free(handle); - return 0; + return LB_STATUS_SUCCESS; } EAPI int livebox_desc_set_category(struct livebox_desc *handle, const char *id, const char *category) @@ -191,23 +192,23 @@ EAPI int livebox_desc_set_category(struct livebox_desc *handle, const char *id, struct block *block; if (!handle || !category) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; block = calloc(1, sizeof(*block)); if (!block) - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; block->type = strdup(LB_DESC_TYPE_INFO); if (!block->type) { free(block); - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; } block->part = strdup("category"); if (!block->part) { free(block->type); free(block); - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; } block->data = strdup(category); @@ -215,7 +216,7 @@ EAPI int livebox_desc_set_category(struct livebox_desc *handle, const char *id, free(block->type); free(block->part); free(block); - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; } if (id) { @@ -225,7 +226,7 @@ EAPI int livebox_desc_set_category(struct livebox_desc *handle, const char *id, free(block->type); free(block->part); free(block); - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; } } @@ -240,23 +241,23 @@ EAPI int livebox_desc_set_size(struct livebox_desc *handle, const char *id, int char buffer[BUFSIZ]; if (!handle) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; block = calloc(1, sizeof(*block)); if (!block) - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; block->type = strdup(LB_DESC_TYPE_INFO); if (!block->type) { free(block); - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; } block->part = strdup("size"); if (!block->part) { free(block->type); free(block); - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; } if (id) { @@ -265,7 +266,7 @@ EAPI int livebox_desc_set_size(struct livebox_desc *handle, const char *id, int free(block->part); free(block->type); free(block); - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; } } @@ -275,7 +276,7 @@ EAPI int livebox_desc_set_size(struct livebox_desc *handle, const char *id, int free(block->part); free(block->type); free(block); - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; } block->idx = handle->last_idx++; @@ -346,26 +347,26 @@ EAPI int livebox_desc_set_id(struct livebox_desc *handle, int idx, const char *i if (block->idx == idx) { if (strcasecmp(block->type, LB_DESC_TYPE_SCRIPT)) { ErrPrint("Invalid block is used\n"); - return -EINVAL; + return LB_STATUS_ERROR_INVALID; } free(block->target_id); block->target_id = NULL; if (!id || !strlen(id)) - return 0; + return LB_STATUS_SUCCESS; block->target_id = strdup(id); if (!block->target_id) { ErrPrint("Heap: %s\n", strerror(errno)); - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; } - return 0; + return LB_STATUS_SUCCESS; } } - return -ENOENT; + return LB_STATUS_ERROR_NOT_EXIST; } /*! @@ -376,7 +377,7 @@ EAPI int livebox_desc_add_block(struct livebox_desc *handle, const char *id, con struct block *block; if (!handle || !type) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; if (!part) part = ""; @@ -385,50 +386,57 @@ EAPI int livebox_desc_add_block(struct livebox_desc *handle, const char *id, con data = ""; block = calloc(1, sizeof(*block)); - if (!block) - return -ENOMEM; + if (!block) { + ErrPrint("Heap: %s\n", strerror(errno)); + return LB_STATUS_ERROR_MEMORY; + } block->type = strdup(type); if (!block->type) { + ErrPrint("Heap: %s\n", strerror(errno)); free(block); - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; } block->part = strdup(part); if (!block->part) { + ErrPrint("Heap: %s\n", strerror(errno)); free(block->type); free(block); - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; } block->data = strdup(data); if (!block->data) { + ErrPrint("Heap: %s\n", strerror(errno)); free(block->type); free(block->part); free(block); - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; } if (option) { block->option = strdup(option); if (!block->option) { + ErrPrint("Heap: %s\n", strerror(errno)); free(block->data); free(block->type); free(block->part); free(block); - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; } } if (id) { block->id = strdup(id); if (!block->id) { + ErrPrint("Heap: %s\n", strerror(errno)); free(block->option); free(block->data); free(block->type); free(block->part); free(block); - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; } } @@ -452,11 +460,11 @@ EAPI int livebox_desc_del_block(struct livebox_desc *handle, int idx) free(block->id); free(block->target_id); free(block); - return 0; + return LB_STATUS_SUCCESS; } } - return -ENOENT; + return LB_STATUS_ERROR_NOT_EXIST; } EAPI struct livebox_buffer *livebox_acquire_buffer(const char *filename, int is_pd, int width, int height, int (*handler)(struct livebox_buffer *, enum buffer_event, double, double, double, void *), void *data) @@ -513,14 +521,14 @@ EAPI int livebox_request_update(const char *filename) if (!filename) { ErrPrint("Invalid argument\n"); - return -EINVAL; + return LB_STATUS_ERROR_INVALID; } uri_len = strlen(filename) + strlen(FILE_SCHEMA) + 1; uri = malloc(uri_len); if (!uri) { ErrPrint("Heap: %s\n", strerror(errno)); - return -ENOMEM; + return LB_STATUS_ERROR_MEMORY; } snprintf(uri, uri_len, FILE_SCHEMA "%s", filename); @@ -539,7 +547,7 @@ EAPI int livebox_release_buffer(struct livebox_buffer *handle) struct livebox_buffer_data *user_data; if (!handle) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; user_data = provider_buffer_user_data(handle); if (user_data) { @@ -585,7 +593,7 @@ EAPI void *livebox_ref_buffer(struct livebox_buffer *handle) EAPI int livebox_unref_buffer(void *buffer) { if (!buffer) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; DbgPrint("Unref buffer\n"); return provider_buffer_unref(buffer); @@ -598,29 +606,29 @@ EAPI int livebox_sync_buffer(struct livebox_buffer *handle) const char *id; if (!handle) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; user_data = provider_buffer_user_data(handle); if (!user_data) { ErrPrint("Invalid buffer\n"); - return -EINVAL; + return LB_STATUS_ERROR_INVALID; } if (user_data->accelerated) { DbgPrint("H/W Buffer allocated. skip the sync buffer\n"); - return 0; + return LB_STATUS_SUCCESS; } pkgname = provider_buffer_pkgname(handle); if (!pkgname) { ErrPrint("Invalid buffer handler\n"); - return -EINVAL; + return LB_STATUS_ERROR_INVALID; } id = provider_buffer_id(handle); if (!id) { ErrPrint("Invalid buffer handler\n"); - return -EINVAL; + return LB_STATUS_ERROR_INVALID; } provider_buffer_sync(handle); @@ -639,13 +647,14 @@ EAPI int livebox_sync_buffer(struct livebox_buffer *handle) if (provider_send_updated(pkgname, id, w, h, -1.0f, NULL, NULL) < 0) ErrPrint("Failed to send updated (%s)\n", id); } - return 0; + + return LB_STATUS_SUCCESS; } EAPI int livebox_support_hw_buffer(struct livebox_buffer *handle) { if (!handle) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; return provider_buffer_pixmap_is_support_hw(handle); } @@ -656,11 +665,11 @@ EAPI int livebox_create_hw_buffer(struct livebox_buffer *handle) int ret; if (!handle) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; user_data = provider_buffer_user_data(handle); if (!user_data) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; if (user_data->accelerated) return -EALREADY; @@ -674,11 +683,11 @@ EAPI int livebox_destroy_hw_buffer(struct livebox_buffer *handle) { struct livebox_buffer_data *user_data; if (!handle) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; user_data = provider_buffer_user_data(handle); if (!user_data || !user_data->accelerated) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; user_data->accelerated = 0; @@ -694,7 +703,7 @@ EAPI void *livebox_buffer_hw_buffer(struct livebox_buffer *handle) user_data = provider_buffer_user_data(handle); if (!user_data || !user_data->accelerated) - return -EINVAL; + return NULL; return provider_buffer_pixmap_hw_addr(handle); } @@ -704,14 +713,14 @@ EAPI int livebox_buffer_pre_render(struct livebox_buffer *handle) struct livebox_buffer_data *user_data; if (!handle) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; user_data = provider_buffer_user_data(handle); if (!user_data) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; if (!user_data->accelerated) - return 0; + return LB_STATUS_SUCCESS; /*! * \note @@ -728,25 +737,25 @@ EAPI int livebox_buffer_post_render(struct livebox_buffer *handle) struct livebox_buffer_data *user_data; if (!handle) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; user_data = provider_buffer_user_data(handle); if (!user_data) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; if (!user_data->accelerated) - return 0; + return LB_STATUS_SUCCESS; pkgname = provider_buffer_pkgname(handle); if (!pkgname) { ErrPrint("Invalid buffer handle\n"); - return -EINVAL; + return LB_STATUS_ERROR_INVALID; } id = provider_buffer_id(handle); if (!id) { ErrPrint("Invalid buffer handler\n"); - return -EINVAL; + return LB_STATUS_ERROR_INVALID; } ret = provider_buffer_post_render(handle); @@ -770,7 +779,7 @@ EAPI int livebox_buffer_post_render(struct livebox_buffer *handle) ErrPrint("Failed to send updated (%s)\n", id); } - return 0; + return LB_STATUS_SUCCESS; } /* End of a file */ diff --git a/src/util.c b/src/util.c index cdcc4cd..9dcc17b 100644 --- a/src/util.c +++ b/src/util.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 Samsung Electronics Co., Ltd * * Licensed under the Flora License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License.