From 9b639a223f9e0c389f646bbb6f09608476495c3d Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Mon, 16 Oct 2017 10:52:54 +0900 Subject: [PATCH] Revert "[4.0] Added an devel-API to check whether video texture is supported" This reverts commit b6a3a40939f19bc3197e7dbac990e83decf272eb. Change-Id: I611063415e7373934f9085f1ca64f5b0502cd92b --- adaptors/common/video-player-impl.cpp | 10 ---------- adaptors/common/video-player-impl.h | 5 ----- adaptors/devel-api/adaptor-framework/video-player-plugin.h | 6 ------ adaptors/devel-api/adaptor-framework/video-player.cpp | 5 ----- adaptors/devel-api/adaptor-framework/video-player.h | 6 ------ 5 files changed, 32 deletions(-) diff --git a/adaptors/common/video-player-impl.cpp b/adaptors/common/video-player-impl.cpp index 0807e2a..50e3e6b 100644 --- a/adaptors/common/video-player-impl.cpp +++ b/adaptors/common/video-player-impl.cpp @@ -289,16 +289,6 @@ void VideoPlayer::Backward( int millisecond ) } } -bool VideoPlayer::IsVideoTextureSupported() -{ - if( mPlugin != NULL ) - { - return mPlugin->IsVideoTextureSupported(); - } - - return false; -} - } // namespace Adaptor; } // namespace Internal; } // namespace Dali; diff --git a/adaptors/common/video-player-impl.h b/adaptors/common/video-player-impl.h index 498a761..e37b5f6 100644 --- a/adaptors/common/video-player-impl.h +++ b/adaptors/common/video-player-impl.h @@ -159,11 +159,6 @@ public: */ void Backward( int millisecond ); - /** - * @brief Dali::VideoPlayer::IsVideoTextureSupported() - */ - bool IsVideoTextureSupported(); - private: /** diff --git a/adaptors/devel-api/adaptor-framework/video-player-plugin.h b/adaptors/devel-api/adaptor-framework/video-player-plugin.h index 10a6d5d..4bbcc04 100644 --- a/adaptors/devel-api/adaptor-framework/video-player-plugin.h +++ b/adaptors/devel-api/adaptor-framework/video-player-plugin.h @@ -211,12 +211,6 @@ public: */ virtual void Backward( int millisecond ) = 0; - /** - * @brief Checks whether the video texture is supported - * @return True if supported, otherwise false. - */ - virtual bool IsVideoTextureSupported() = 0; - }; } // namespace Dali; diff --git a/adaptors/devel-api/adaptor-framework/video-player.cpp b/adaptors/devel-api/adaptor-framework/video-player.cpp index 048a9f0..fb4b2a2 100644 --- a/adaptors/devel-api/adaptor-framework/video-player.cpp +++ b/adaptors/devel-api/adaptor-framework/video-player.cpp @@ -171,10 +171,5 @@ void VideoPlayer::Backward( int millisecond ) GetImplementation( *this ).Backward( millisecond ); } -bool VideoPlayer::IsVideoTextureSupported() -{ - return GetImplementation( *this ).IsVideoTextureSupported(); -} - } // namespace Dali; diff --git a/adaptors/devel-api/adaptor-framework/video-player.h b/adaptors/devel-api/adaptor-framework/video-player.h index c630c72..8c69719 100644 --- a/adaptors/devel-api/adaptor-framework/video-player.h +++ b/adaptors/devel-api/adaptor-framework/video-player.h @@ -241,12 +241,6 @@ public: */ void Backward( int millisecond ); - /** - * @brief Checks whether the video texture is supported - * @return True if supported, otherwise false. - */ - bool IsVideoTextureSupported(); - private: // Not intended for application developers /** -- 2.7.4