Integrate IPC related errors

[platform/core/api/media-content.git] / src / media_group.c

diff --git a/src/media_group.c b/src/media_group.c
index eea6b58..90350aa 100755 (executable)
--- a/src/media_group.c
+++ b/src/media_group.c
@@ -78,21 +78,19 @@ int media_album_get_album_from_db(int album_id, media_album_h *album)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
        sqlite3_stmt *stmt = NULL;
-       char select_query[DEFAULT_QUERY_SIZE];
+       char select_query[DEFAULT_QUERY_SIZE] = {0, };
 
-       if (album_id < 0) {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(album_id <= 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid album_id [%d]", album_id);
+       media_content_retvm_if(album == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid album");
 
        memset(select_query, 0x00, sizeof(select_query));
 
        snprintf(select_query, sizeof(select_query), SELECT_ALBUM_FROM_ALBUM, album_id);
 
-       ret = _content_query_prepare(&stmt, select_query, NULL, NULL);
+       ret = _content_get_result(select_query, &stmt);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
-       while (sqlite3_step(stmt) == SQLITE_ROW) {
+       if (sqlite3_step(stmt) == SQLITE_ROW) {
                media_album_s *_album = (media_album_s*)calloc(1, sizeof(media_album_s));
                if (_album == NULL) {
                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
@@ -100,9 +98,10 @@ int media_album_get_album_from_db(int album_id, media_album_h *album)
                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                }
 
-               _album->album_id = (int)sqlite3_column_int(stmt, 0);
-               _album->name = g_strdup((const char *)sqlite3_column_text(stmt, 1));
-               _album->artist = g_strdup((const char *)sqlite3_column_text(stmt, 2));
+               _album->album_id = album_id;
+               _album->name = g_strdup((const char *)sqlite3_column_text(stmt, 0));
+               _album->artist = g_strdup((const char *)sqlite3_column_text(stmt, 1));
+               _album->album_art_path = g_strdup((const char *)sqlite3_column_text(stmt, 2));
 
                *album = (media_album_h)_album;
        }
@@ -266,7 +265,7 @@ int media_album_get_album_art(media_album_h album, char **album_art)
 int media_group_get_group_count_from_db(filter_h filter, media_group_e group, int *group_count)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
-#ifdef _USE_TV_PROFILE
+#ifdef _USE_TVPD_MODE
        if ((group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_GROUP_MAX) || (group_count == NULL)) {
 #else
        if ((group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX) || (group_count == NULL)) {
@@ -279,7 +278,7 @@ int media_group_get_group_count_from_db(filter_h filter, media_group_e group, in
 
        return ret;
 }
-#ifdef _USE_TV_PROFILE
+#ifdef _USE_TVPD_MODE
 int media_group_foreach_group_and_count_from_db(filter_h filter, media_group_e group, media_group_and_count_cb callback, void *user_data)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
@@ -298,7 +297,7 @@ int media_group_foreach_group_and_count_from_db(filter_h filter, media_group_e g
 int media_group_foreach_group_from_db(filter_h filter, media_group_e group, media_group_cb callback, void *user_data)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
-#ifdef _USE_TV_PROFILE
+#ifdef _USE_TVPD_MODE
        if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_GROUP_MAX)) {
 #else
        if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) {
@@ -315,7 +314,7 @@ int media_group_foreach_group_from_db(filter_h filter, media_group_e group, medi
 int media_group_get_media_count_from_db(const char *group_name, media_group_e group, filter_h filter, int *media_count)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
-#ifdef _USE_TV_PROFILE
+#ifdef _USE_TVPD_MODE
        if ((media_count == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_GROUP_MAX)) {
 #else
        if ((media_count == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) {
@@ -332,7 +331,7 @@ int media_group_get_media_count_from_db(const char *group_name, media_group_e gr
 int media_group_foreach_media_from_db(const char *group_name, media_group_e group, filter_h filter, media_info_cb callback, void *user_data)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
-#ifdef _USE_TV_PROFILE
+#ifdef _USE_TVPD_MODE
        if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_GROUP_MAX)) {
 #else
        if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) {