[v0.2.31] fix svace issue and sync param name with player api pkg

Change-Id: I6d1ff2645f3ba5a438c0d7309af4a86d1ad94f0c

diff --git a/muse/src/muse_player.c b/muse/src/muse_player.c
index 41cb2d01ed5e47ba286a4b3c4819e3a51a29950d..19f8d36a93e5815deb28f2da6ce792b1f4fb9c9e 100644 (file)
--- a/muse/src/muse_player.c
+++ b/muse/src/muse_player.c
@@ -932,6 +932,11 @@ int player_disp_prepare_async(muse_module_h module)
        muse_player = (muse_player_handle_s *)muse_core_ipc_get_handle(module);
 
        prepare_data = g_new(prepare_data_s, 1);
+       if (!prepare_data) {
+               ret = PLAYER_ERROR_INVALID_OPERATION;
+               goto ERROR;
+       }
+
        prepare_data->player = muse_player->player_handle;
        prepare_data->module = module;
 
@@ -939,10 +944,11 @@ int player_disp_prepare_async(muse_module_h module)
        if (ret == PLAYER_ERROR_NONE) {
                legacy_player_get_timeout_for_muse(muse_player->player_handle, &timeout);
                player_msg_return1(api, ret, module, INT, timeout);
-       } else {
-               player_msg_return(api, ret, module);
-       }
+               return ret;
+       } /* else is error */
 
+ERROR:
+       player_msg_return(api, ret, module);
        return ret;
 }
 
@@ -1817,12 +1823,12 @@ int player_disp_set_progressive_download_path(muse_module_h module)
        int ret = PLAYER_ERROR_NONE;
        muse_player_handle_s *muse_player = NULL;
        muse_player_api_e api = MUSE_PLAYER_API_SET_PROGRESSIVE_DOWNLOAD_PATH;
-       char path[MUSE_URI_MAX_LENGTH] = { 0, };
+       char dw_path[MUSE_URI_MAX_LENGTH] = { 0, };
 
        muse_player = (muse_player_handle_s *)muse_core_ipc_get_handle(module);
-       player_msg_get_string(path, muse_core_client_get_msg(module));
+       player_msg_get_string(dw_path, muse_core_client_get_msg(module));
 
-       ret = legacy_player_set_progressive_download_path(muse_player->player_handle, path);
+       ret = legacy_player_set_progressive_download_path(muse_player->player_handle, dw_path);
        player_msg_return(api, ret, module);
 
        return ret;
@@ -1959,12 +1965,12 @@ int player_disp_set_subtitle_path(muse_module_h module)
        int ret = PLAYER_ERROR_NONE;
        muse_player_handle_s *muse_player = NULL;
        muse_player_api_e api = MUSE_PLAYER_API_SET_SUBTITLE_PATH;
-       char path[MUSE_URI_MAX_LENGTH] = { 0, };
+       char subtitle_path[MUSE_URI_MAX_LENGTH] = { 0, };
 
        muse_player = (muse_player_handle_s *)muse_core_ipc_get_handle(module);
-       player_msg_get_string(path, muse_core_client_get_msg(module));
+       player_msg_get_string(subtitle_path, muse_core_client_get_msg(module));
 
-       ret = legacy_player_set_subtitle_path(muse_player->player_handle, path);
+       ret = legacy_player_set_subtitle_path(muse_player->player_handle, subtitle_path);
 
        player_msg_return(api, ret, module);
 

diff --git a/packaging/mmsvc-player.spec b/packaging/mmsvc-player.spec
index a1a5a6ccaca8f48882fbed72b71e75d285cb9072..f7abf347ea241d2ee34646942f200df14cbb5f63 100644 (file)
--- a/packaging/mmsvc-player.spec
+++ b/packaging/mmsvc-player.spec
@@ -1,6 +1,6 @@
 Name:       mmsvc-player
 Summary:    A Media Player module for muse server
-Version:    0.2.30
+Version:    0.2.31
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0