[0.2.66] apply changed interface to share the storage id

to consider the multiple external storage scenario

Change-Id: If5fd34b68b58d5e33b03b46d30e9334b89b0efd7
(cherry picked from commit 439660fcf38b12e3cd016efe495f7917a39bf871)

diff --git a/legacy/include/legacy_player.h b/legacy/include/legacy_player.h
index 91e0a018f0434973cbfc7125ebd7703c5fd3f2d5..58072c62d9c11608e325243eb8c65adeb50c139e 100644 (file)
--- a/legacy/include/legacy_player.h
+++ b/legacy/include/legacy_player.h
@@ -2021,6 +2021,7 @@ int legacy_player_unset_retrieve_buffer_cb(player_h player);
  * @brief Manage the external storage state
  * @since_tizen 3.0
  * @param[in] player The handle to the media player
+ * @param[in] id The id of external storage
  * @param[in] state The state of external storage
  * @return @c 0 on success,
  *         otherwise a negative error value
@@ -2028,7 +2029,7 @@ int legacy_player_unset_retrieve_buffer_cb(player_h player);
  * @retval  #PLAYER_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval  #PLAYER_ERROR_INVALID_OPERATION Invalid operation
  */
-int legacy_player_manage_external_storage_state(player_h player, int state);
+int legacy_player_manage_external_storage_state(player_h player, int id, int state);
 
 /**
  * @brief Sets the ROI(Region Of Interest) area of display.

diff --git a/legacy/src/legacy_player.c b/legacy/src/legacy_player.c
index 36a4aa55d9dfc7da0e69fdcdaabbc8114f54949f..5ca9893883fc33d15fc8d2d0eabdd67a3f0c4e3c 100644 (file)
--- a/legacy/src/legacy_player.c
+++ b/legacy/src/legacy_player.c
@@ -3176,13 +3176,13 @@ int legacy_player_set_file_buffering_path(player_h player, const char *file_path
                return PLAYER_ERROR_NONE;
 }
 
-int legacy_player_manage_external_storage_state(player_h player, int state)
+int legacy_player_manage_external_storage_state(player_h player, int id, int state)
 {
        int ret = PLAYER_ERROR_NONE;
        PLAYER_INSTANCE_CHECK(player);
        player_s *handle = (player_s *)player;
 
-       ret = mm_player_manage_external_storage_state(handle->mm_handle, state);
+       ret = mm_player_manage_external_storage_state(handle->mm_handle, id, state);
 
        if (ret != MM_ERROR_NONE)
                return __player_convert_error_code(ret, (char *)__FUNCTION__);

diff --git a/muse/src/muse_player_dispatcher.c b/muse/src/muse_player_dispatcher.c
index fa153cdcf5eb8bfe05e835920f01530d1d0daace..a7841682aa5d6e666c7305fb292280e5e027a194 100644 (file)
--- a/muse/src/muse_player_dispatcher.c
+++ b/muse/src/muse_player_dispatcher.c
@@ -81,7 +81,7 @@ static int player_cmd_resouce_not_available(muse_module_h module)
 static int player_cmd_external_storage_state_changed(muse_module_h module)
 {
        muse_player_handle_s *muse_player = NULL;
-       int state = -1;
+       muse_external_storage_info_t *storage_info = NULL;
        void *data = NULL;
 
        muse_player = (muse_player_handle_s *)muse_server_ipc_get_handle(module);
@@ -90,15 +90,15 @@ static int player_cmd_external_storage_state_changed(muse_module_h module)
                return PLAYER_ERROR_NONE;
        }
 
-       if (!(data = muse_server_get_cust_data(module))) {
+       if (!(data = muse_server_get_user_data(module))) {
                LOGE("user_data for state value is NULL.");
                return PLAYER_ERROR_NONE;
        }
 
-       state = GPOINTER_TO_INT(data);
+       storage_info = (muse_external_storage_info_t *)(data);
 
-       LOGW("external state is changed %d", state);
-       legacy_player_manage_external_storage_state(muse_player->player_handle, state);
+       LOGW("external state is changed %d:%d", storage_info->id, storage_info->state);
+       legacy_player_manage_external_storage_state(muse_player->player_handle, storage_info->id, storage_info->state);
 
        LOGD("LEAVE");
        return PLAYER_ERROR_NONE;

diff --git a/packaging/mmsvc-player.spec b/packaging/mmsvc-player.spec
index 70c7b8e31028949faac3e3c76d7967856d23b1ff..c75d4b573a26cc088a6d9c8bbb4add0a7dc063f8 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.65
+Version:    0.2.66
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0