[4.0] Added destroying playback handle

Change-Id: Ia8a88dd216bbaa8fc0a991b3da8d27dc24f82684

diff --git a/dali-extension/video-player/tizen-video-player.cpp b/dali-extension/video-player/tizen-video-player.cpp
index 1e22c5f..d5b1ccf 100644 (file)
--- a/dali-extension/video-player/tizen-video-player.cpp
+++ b/dali-extension/video-player/tizen-video-player.cpp
@@ -225,6 +225,7 @@ TizenVideoPlayer::TizenVideoPlayer()
 
 TizenVideoPlayer::~TizenVideoPlayer()
 {
+  DestroyPlayer();
 }
 
 void TizenVideoPlayer::GetPlayerState( player_state_e* state )
@@ -269,24 +270,7 @@ std::string TizenVideoPlayer::GetUrl()
 
 void TizenVideoPlayer::SetRenderingTarget( Any target )
 {
-  int error;
-  if( mPlayerState != PLAYER_STATE_NONE )
-  {
-    GetPlayerState( &mPlayerState );
-
-    if( mPlayerState != PLAYER_STATE_IDLE )
-    {
-      Stop();
-      error = player_unprepare( mPlayer );
-      LogPlayerError( error );
-    }
-
-    error = player_destroy( mPlayer );
-    LogPlayerError( error );
-    mPlayerState = PLAYER_STATE_NONE;
-    mPlayer = NULL;
-    mUrl = "";
-  }
+  DestroyPlayer();
 
   mNativeImageSourcePtr = NULL;
   mEcoreWlWindow = NULL;
@@ -755,5 +739,27 @@ bool TizenVideoPlayer::IsVideoTextureSupported()
   return featureFlag;
 }
 
+void TizenVideoPlayer::DestroyPlayer()
+{
+  int error;
+  if( mPlayerState != PLAYER_STATE_NONE )
+  {
+    GetPlayerState( &mPlayerState );
+
+    if( mPlayerState != PLAYER_STATE_IDLE )
+    {
+      Stop();
+      error = player_unprepare( mPlayer );
+      LogPlayerError( error );
+    }
+
+    error = player_destroy( mPlayer );
+    LogPlayerError( error );
+    mPlayerState = PLAYER_STATE_NONE;
+    mPlayer = NULL;
+    mUrl = "";
+  }
+}
+
 } // namespace Plugin
 } // namespace Dali;

diff --git a/dali-extension/video-player/tizen-video-player.h b/dali-extension/video-player/tizen-video-player.h
index 2dc2b0a..0f8845b 100644 (file)
--- a/dali-extension/video-player/tizen-video-player.h
+++ b/dali-extension/video-player/tizen-video-player.h
@@ -205,6 +205,11 @@ private:
    */
   void InitializeUnderlayMode( Ecore_Wl_Window* ecoreWlWindow );
 
+  /**
+   * @brief Destroys player handle
+   */
+  void DestroyPlayer();
+
 private:
 
   std::string mUrl; ///< The video file path