diff options
Diffstat (limited to 'src/ipc/media-thumb-ipc.c')
-rwxr-xr-x | src/ipc/media-thumb-ipc.c | 92 |
1 files changed, 26 insertions, 66 deletions
diff --git a/src/ipc/media-thumb-ipc.c b/src/ipc/media-thumb-ipc.c index 5faed91..63f22d4 100755 --- a/src/ipc/media-thumb-ipc.c +++ b/src/ipc/media-thumb-ipc.c @@ -1041,41 +1041,15 @@ int _media_thumb_request_raw_data_async(int msg_type, int request_id, const char return err; } -int _media_thumb_request_cancel_all(bool isRaw) +int _media_thumb_request_cancel_all() { int i; int req_len = -1; int len = 0; + thumbRawReq *tmp_raw_req = NULL; - if (isRaw) { - thumbRawReq *tmp_raw_req = NULL; - if (g_manage_raw_queue == NULL) { - thumb_err("manage_queue is NULL"); - if (g_request_raw_queue != NULL) { - /* Check request queue */ - len = g_queue_get_length(g_request_raw_queue); - if (len > 0) { - tmp_raw_req = g_queue_peek_head(g_request_raw_queue); - if (tmp_raw_req != NULL) - tmp_raw_req->isCanceled = true; - return MS_MEDIA_ERR_NONE; - } - } - thumb_err("request_queue is NULL"); - return MS_MEDIA_ERR_INTERNAL; - } - req_len = g_queue_get_length(g_manage_raw_queue); - for (i = 0; i < req_len; i++) { - tmp_raw_req = g_queue_pop_tail(g_manage_raw_queue); - if (tmp_raw_req) { - SAFE_FREE(tmp_raw_req->path); - SAFE_FREE(tmp_raw_req->userData); - SAFE_FREE(tmp_raw_req); - tmp_raw_req = NULL; - } - } - g_queue_free(g_manage_raw_queue); - g_manage_raw_queue = NULL; + if (g_manage_raw_queue == NULL) { + thumb_err("manage_queue is NULL"); if (g_request_raw_queue != NULL) { /* Check request queue */ len = g_queue_get_length(g_request_raw_queue); @@ -1083,45 +1057,31 @@ int _media_thumb_request_cancel_all(bool isRaw) tmp_raw_req = g_queue_peek_head(g_request_raw_queue); if (tmp_raw_req != NULL) tmp_raw_req->isCanceled = true; + return MS_MEDIA_ERR_NONE; } } - } else { - thumbReq *tmp_req = NULL; - if (g_manage_queue == NULL) { - thumb_err("manage_queue is NULL"); - if (g_request_queue != NULL) { - /* Check request queue */ - len = g_queue_get_length(g_request_queue); - if (len > 0) { - tmp_req = g_queue_peek_head(g_request_queue); - if (tmp_req != NULL) - tmp_req->isCanceled = true; - return MS_MEDIA_ERR_NONE; - } - } - thumb_err("request_queue is NULL"); - return MS_MEDIA_ERR_INTERNAL; - } - req_len = g_queue_get_length(g_manage_queue); - for (i = 0; i < req_len; i++) { - tmp_req = g_queue_pop_tail(g_manage_queue); - if (tmp_req) { - SAFE_FREE(tmp_req->path); - SAFE_FREE(tmp_req->userData); - SAFE_FREE(tmp_req); - tmp_req = NULL; - } + thumb_err("request_queue is NULL"); + return MS_MEDIA_ERR_INTERNAL; + } + req_len = g_queue_get_length(g_manage_raw_queue); + for (i = 0; i < req_len; i++) { + tmp_raw_req = g_queue_pop_tail(g_manage_raw_queue); + if (tmp_raw_req) { + SAFE_FREE(tmp_raw_req->path); + SAFE_FREE(tmp_raw_req->userData); + SAFE_FREE(tmp_raw_req); + tmp_raw_req = NULL; } - g_queue_free(g_manage_queue); - g_manage_queue = NULL; - if (g_request_queue != NULL) { - /* Check request queue */ - len = g_queue_get_length(g_request_queue); - if (len > 0) { - tmp_req = g_queue_peek_head(g_request_queue); - if (tmp_req != NULL) - tmp_req->isCanceled = true; - } + } + g_queue_free(g_manage_raw_queue); + g_manage_raw_queue = NULL; + if (g_request_raw_queue != NULL) { + /* Check request queue */ + len = g_queue_get_length(g_request_raw_queue); + if (len > 0) { + tmp_raw_req = g_queue_peek_head(g_request_raw_queue); + if (tmp_raw_req != NULL) + tmp_raw_req->isCanceled = true; } } |