From 90acaa159c20cfd065402e37bef807be3fce8106 Mon Sep 17 00:00:00 2001 From: "bhutani.92" Date: Fri, 9 Dec 2016 15:19:05 +0530 Subject: [PATCH] Changed Deprecated Media Content API's Change-Id: I15c6195c6e80f102ad26a9b67900751891932e54 Signed-off-by: bhutani.92 --- src/common/mp-app.c | 12 ++++++++---- src/common/mp-media-info.c | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/common/mp-app.c b/src/common/mp-app.c index a90fe26..52a82b1 100644 --- a/src/common/mp-app.c +++ b/src/common/mp-app.c @@ -400,7 +400,7 @@ mp_app_noti_init(void *data) { startfunc; int retcode = -1; - struct appdata *ad = data; + struct appdata *ad = (struct appdata *)data; int error = storage_foreach_device_supported(mp_app_get_supported_storages_callback, ad); if (error == STORAGE_ERROR_NONE) { storage_state_e state; @@ -449,8 +449,8 @@ mp_app_noti_init(void *data) WARN_TRACE("Leave sound_manager_set_active_device_changed_cb"); ret = mp_media_info_set_db_update_cb(_mp_app_db_update_cb, NULL); - if (ret) { - ERROR_TRACE("Unable to set db update cb [0x%x]", ret); + if (ret != 0) { + ERROR_TRACE("Error from mp_media_info_set_db_update_cb [0x%x]", ret); } return res; @@ -461,6 +461,7 @@ mp_app_noti_ignore(void *data) { struct appdata *ad = (struct appdata *)data; int retcode = -1; + int ret = 0; retcode = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_SOUND_SILENT_MODE); if (retcode != SYSTEM_SETTINGS_ERROR_NONE) { ERROR_TRACE("Error when ignore callback [%d]", retcode); @@ -477,7 +478,10 @@ mp_app_noti_ignore(void *data) gNotiPipe = NULL; } - mp_media_info_unset_db_update_cb(); + ret = mp_media_info_unset_db_update_cb(); + if (ret != 0) { + ERROR_TRACE("Error from mp_media_info_unset_db_update_cb [0x%x]", ret); + } return TRUE; } diff --git a/src/common/mp-media-info.c b/src/common/mp-media-info.c index 6f4cf18..9ce3b84 100644 --- a/src/common/mp-media-info.c +++ b/src/common/mp-media-info.c @@ -96,6 +96,8 @@ struct mp_media_info_s { #define STRNCAT_LEN(dest) (sizeof(dest)-1-strlen(dest)) +media_content_noti_h noti_handle; + static void _mp_media_info_sql_strncat(char *buf, const char *query, int size) { char *sql = sqlite3_mprintf("%q", query); @@ -2895,7 +2897,7 @@ int mp_media_info_set_db_update_cb(db_update_cb cb, void *data) g_db_update_cb = cb; g_db_update_data = data; - return media_content_set_db_updated_cb(mp_media_content_db_update_cb, NULL); + return media_content_add_db_updated_cb(mp_media_content_db_update_cb, NULL, ¬i_handle); } int mp_media_info_unset_db_update_cb(void) @@ -2903,5 +2905,5 @@ int mp_media_info_unset_db_update_cb(void) mp_ecore_timer_del(g_db_update_timer); g_db_update_cb = NULL; g_db_update_data = NULL; - return media_content_unset_db_updated_cb(); + return media_content_remove_db_updated_cb(noti_handle); } -- 2.7.4