Apply latest codes migration

[apps/core/preloaded/message-app.git] / viewer / smil-player / src / msg-smil-player.c

diff --git a/viewer/smil-player/src/msg-smil-player.c b/viewer/smil-player/src/msg-smil-player.c
index 4d134a7..77898e6 100755 (executable)
--- a/viewer/smil-player/src/msg-smil-player.c
+++ b/viewer/smil-player/src/msg-smil-player.c
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.tizenopensource.org/license
+ *    http://floralicense.org/license
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -239,44 +239,43 @@ MSG_SMIL_ERROR_E _msg_smil_player_on_slide_event_handler(void **hSmilHandle, SMI
                _msg_smil_render_rotate_video_window(smilPlayerHndle->smilRenderer);
                err = MSG_SMIL_SUCCESS;
                break;
-       case PLAYER_EVENT_PLAY:
-               _msg_smil_event_mgr_set_video_endofstream(smilPlayerHndle->smilEvntMgrHndle, FALSE);
-               if (slideTimerCbData->timerHandle) {
-                       err = _msg_smil_event_mgr_stop_slide(smilPlayerHndle->smilEvntMgrHndle);
-                       if (err != MSG_SMIL_SUCCESS) {
-                               MSG_UI_DEBUG(MSG_UI_LEVEL_ERR, "_msg_smil_event_mgr_stop_slide is failed: PLAYER_EVENT_PLAY_SLIDE");
-                               return err;
-                       }
-
-                       _msg_smil_render_stop_playing_file(smilPlayerHndle->smilRenderer);
-               }
+       case PLAYER_EVENT_READY:
+       case PLAYER_EVENT_PREVIEW_READY:
+               if (playerEvent == PLAYER_EVENT_PREVIEW_READY)
+                       _msg_smil_cont_mgr_delete_help_page(smilPlayerHndle->smilRenderer->msg_info_t, smilPlayerHndle->smilContMgrHndle);      //delete help page
 
                _msg_smil_event_mgr_set_current_slide(smilPlayerHndle->smilEvntMgrHndle, NULL);
                _msg_smil_event_mgr_set_page_action_type(smilPlayerHndle->smilEvntMgrHndle, PAGE_EVENT_PLAY);
-               err = _msg_smil_event_mgr_play_slide(smilPlayerHndle->smilEvntMgrHndle, slideIdx);
+               err = _msg_smil_event_mgr_ready(smilPlayerHndle->smilEvntMgrHndle);
                if (err != MSG_SMIL_SUCCESS) {
-                       MSG_UI_DEBUG(MSG_UI_LEVEL_ERR, "_msg_smil_event_mgr_play_slide is failed: PLAYER_EVENT_PLAY");
+                       MSG_UI_DEBUG(MSG_UI_LEVEL_ERR, "_msg_smil_event_mgr_play_slide is failed: PLAYER_EVENT_READY");
                        return err;
                }
                break;
-       case PLAYER_EVENT_PREVIEW_PLAY:
+       case PLAYER_EVENT_START:
+               err = _msg_smil_event_mgr_start(smilPlayerHndle->smilEvntMgrHndle);
+               if (err != MSG_SMIL_SUCCESS) {
+                       MSG_UI_DEBUG(MSG_UI_LEVEL_ERR, "_msg_smil_event_mgr_start_slide_event is failed: PLAYER_EVENT_START");
+                       return err;
+               }
+               break;
+       case PLAYER_EVENT_PLAY:
                _msg_smil_event_mgr_set_video_endofstream(smilPlayerHndle->smilEvntMgrHndle, FALSE);
                if (slideTimerCbData->timerHandle) {
                        err = _msg_smil_event_mgr_stop_slide(smilPlayerHndle->smilEvntMgrHndle);
                        if (err != MSG_SMIL_SUCCESS) {
-                               MSG_UI_DEBUG(MSG_UI_LEVEL_ERR, "_msg_smil_event_mgr_stop_slide is failed: PLAYER_EVENT_PLAY_SLIDE");
+                               MSG_UI_DEBUG(MSG_UI_LEVEL_ERR, "_msg_smil_event_mgr_stop_slide is failed: PLAYER_EVENT_PLAY");
                                return err;
                        }
 
                        _msg_smil_render_stop_playing_file(smilPlayerHndle->smilRenderer);
                }
 
-               _msg_smil_cont_mgr_delete_help_page(smilPlayerHndle->smilRenderer->msg_info_t, smilPlayerHndle->smilContMgrHndle);      //delete help page
                _msg_smil_event_mgr_set_current_slide(smilPlayerHndle->smilEvntMgrHndle, NULL);
                _msg_smil_event_mgr_set_page_action_type(smilPlayerHndle->smilEvntMgrHndle, PAGE_EVENT_PLAY);
                err = _msg_smil_event_mgr_play_slide(smilPlayerHndle->smilEvntMgrHndle, slideIdx);
                if (err != MSG_SMIL_SUCCESS) {
-                       MSG_UI_DEBUG(MSG_UI_LEVEL_ERR, "_msg_smil_event_mgr_play_slide is failed: PLAYER_EVENT_PREVIEW_PLAY");
+                       MSG_UI_DEBUG(MSG_UI_LEVEL_ERR, "_msg_smil_event_mgr_play_slide is failed: PLAYER_EVENT_PLAY");
                        return err;
                }
                break;
@@ -453,8 +452,17 @@ MSG_BOOL _msg_smil_set_smil_player_entry_handle_cb(void *hSmilHandle, void *call
 MSG_BOOL _msg_smil_get_slide_time(void *hSmilHandle, int slideIdx, MSG_BOOL bExcludeHp, double *slideTime)
 {
        MSG_UI_ENTER(MSG_UI_LEVEL_DEBUG);
-       MSG_UI_RETV_IF(MSG_UI_LEVEL_ERR, hSmilHandle == NULL, PLAYER_STATUS_NONE);
+       MSG_UI_RETV_IF(MSG_UI_LEVEL_ERR, hSmilHandle == NULL, FALSE);
        SMIL_HANDLER_S *smilPlayerHndle = (SMIL_HANDLER_S *)hSmilHandle;
 
        return _msg_smil_cont_mgr_get_slide_time(smilPlayerHndle->smilContMgrHndle, slideIdx, bExcludeHp, slideTime);
+}
+
+MSG_BOOL _msg_smil_request_player_start(void *hSmilHandle)
+{
+       MSG_UI_ENTER(MSG_UI_LEVEL_DEBUG);
+       MSG_UI_RETV_IF(MSG_UI_LEVEL_ERR, hSmilHandle == NULL, FALSE);
+       SMIL_HANDLER_S *smilPlayerHndle = (SMIL_HANDLER_S *)hSmilHandle;
+
+       return _msg_smil_render_mgr_request_player_start((void *)smilPlayerHndle->smilRenderer);
 }
\ No newline at end of file