[0.2.127] remove duplicated code block

- rewrite code about
  commit : 890ad09a8b1bfa6bbd086d1eeeb6a57b93ad6890

Change-Id: I871d381c9bd9b7e3e24c973bf30fc6bf03787fdf

diff --git a/muse/include/muse_player_private.h b/muse/include/muse_player_private.h
index a726f8589fdb9e62056b3ffc89e80a7250d1e5fb..9b09b5c8586227719e00d52fd49ecba35dc2f8df 100644 (file)
--- a/muse/include/muse_player_private.h
+++ b/muse/include/muse_player_private.h
@@ -61,9 +61,7 @@ typedef struct {
        muse_module_h module;
 } prepare_data_t;
 
-void _mplayer_remove_export_media_packet(muse_module_h module);
-bool _mplayer_remove_export_data(muse_module_h module, int key, bool remove_all);
-
+int _mplayer_destroy(muse_module_h module);
 
 #ifdef __cplusplus
 }

diff --git a/muse/src/muse_player.c b/muse/src/muse_player.c
index 88b3aad58aea56a41bc3470cb4e674848c00b826..355d2626ae8d2962fbb23f7307651e86d10db399 100644 (file)
--- a/muse/src/muse_player.c
+++ b/muse/src/muse_player.c
@@ -154,7 +154,7 @@ ERROR:
        return false;
 }
 
-bool _mplayer_remove_export_data(muse_module_h module, int key, bool remove_all)
+static bool __mplayer_remove_export_data(muse_module_h module, int key, bool remove_all)
 {
        bool ret = true;
        muse_player_handle_t *muse_player = NULL;
@@ -277,7 +277,7 @@ EXIT:
        return;
 }
 
-void _mplayer_remove_export_media_packet(muse_module_h module)
+static void __mplayer_remove_export_media_packet(muse_module_h module)
 {
        muse_player_handle_t *muse_player = NULL;
 
@@ -1127,6 +1127,37 @@ int _mplayer_disp_send_msg(int send_fd, char *msg, int *tfd)
        return PLAYER_ERROR_NONE;
 }
 
+int _mplayer_destroy(muse_module_h module)
+{
+       int ret = PLAYER_ERROR_NONE;
+       muse_player_handle_t *muse_player =
+               (muse_player_handle_t *)muse_server_ipc_get_handle(module);
+
+       /* decoder buffer need to be released first to destroy pipeline */
+       __mplayer_remove_export_media_packet(module);
+
+       ret = legacy_player_destroy(muse_player->player_handle);
+
+       if (muse_player->audio_format) {
+               media_format_unref(muse_player->audio_format);
+               muse_player->audio_format = NULL;
+       }
+       if (muse_player->video_format) {
+               media_format_unref(muse_player->video_format);
+               muse_player->video_format = NULL;
+       }
+
+       __mplayer_remove_export_data(module, 0, true);
+       g_mutex_clear(&muse_player->list_lock);
+
+       muse_player->bufmgr = NULL;
+
+       g_free(muse_player);
+       muse_player = NULL;
+
+       return ret;
+}
+
 int player_disp_create(muse_module_h module)
 {
        int ret = PLAYER_ERROR_NONE;
@@ -1193,34 +1224,10 @@ int player_disp_destroy(muse_module_h module)
 {
        int ret = PLAYER_ERROR_NONE;
        muse_player_api_e api = MUSE_PLAYER_API_DESTROY;
-       muse_player_handle_t *muse_player = NULL;
-
-       muse_player = (muse_player_handle_t *)muse_server_ipc_get_handle(module);
-
-       /* decoder buffer need to be released first to destroy pipeline */
-       _mplayer_remove_export_media_packet(module);
-
-       ret = legacy_player_destroy(muse_player->player_handle);
-
-       if (muse_player->audio_format) {
-               media_format_unref(muse_player->audio_format);
-               muse_player->audio_format = NULL;
-       }
-       if (muse_player->video_format) {
-               media_format_unref(muse_player->video_format);
-               muse_player->video_format = NULL;
-       }
-
-       _mplayer_remove_export_data(module, 0, true);
-       g_mutex_clear(&muse_player->list_lock);
-
-       muse_player->bufmgr = NULL;
 
-       g_free(muse_player);
-       muse_player = NULL;
+       ret = _mplayer_destroy(module);
 
        PLAYER_RETURN_MSG(api, ret, module);
-
        return PLAYER_ERROR_NONE; /* to clean up the resource */
 }
 
@@ -1297,7 +1304,7 @@ int player_disp_unprepare(muse_module_h module)
        unset_cb = !muse_player->export_video_data;
 
        /* decoder buffer need to be released first to destroy pipeline */
-       _mplayer_remove_export_media_packet(module);
+       __mplayer_remove_export_media_packet(module);
 
        ret = legacy_player_unprepare(muse_player->player_handle);
 
@@ -1309,7 +1316,7 @@ int player_disp_unprepare(muse_module_h module)
        if (!muse_player->export_audio_data)
                legacy_player_unset_callback(muse_player->player_handle, MUSE_PLAYER_EVENT_TYPE_MEDIA_PACKET_AUDIO_FRAME);
 
-       _mplayer_remove_export_data(module, 0, true);
+       __mplayer_remove_export_data(module, 0, true);
 
        PLAYER_RETURN_MSG(api, ret, module);
 
@@ -2818,7 +2825,7 @@ int player_disp_return_buffer(muse_module_h module)       /* MUSE_PLAYER_API_RETURN_BU
 
        /* LOGD("handle : %p, key : %d", muse_player, key); */
 
-       if (!_mplayer_remove_export_data(module, key, false))
+       if (!__mplayer_remove_export_data(module, key, false))
                LOGE("failed to remove export data : key %d", key);
 
        /* This funct does not send return value to client.        *

diff --git a/muse/src/muse_player_dispatcher.c b/muse/src/muse_player_dispatcher.c
index 7bdc58bff0d274ca63e1f719c1dc93b66dae91df..eae981b11c9d1f389aaa6353d7fd195a3a9a67d2 100644 (file)
--- a/muse/src/muse_player_dispatcher.c
+++ b/muse/src/muse_player_dispatcher.c
@@ -49,22 +49,7 @@ static int player_cmd_shutdown(muse_module_h module)
                legacy_player_unprepare(muse_player->player_handle);
                /* FALLTHROUGH */
        case PLAYER_STATE_IDLE:
-               _mplayer_remove_export_media_packet(module);
-               legacy_player_destroy(muse_player->player_handle);
-
-               if (muse_player->audio_format) {
-                       media_format_unref(muse_player->audio_format);
-                       muse_player->audio_format = NULL;
-               }
-               if (muse_player->video_format) {
-                       media_format_unref(muse_player->video_format);
-                       muse_player->video_format = NULL;
-               }
-               _mplayer_remove_export_data(module, 0, true);
-               g_mutex_clear(&muse_player->list_lock);
-               muse_player->bufmgr = NULL;
-               g_free(muse_player);
-               muse_player = NULL;
+               _mplayer_destroy(module);
                break;
 
        default: