From 5e638edbd7f44235a24afe9b279ea2e111eb5cf6 Mon Sep 17 00:00:00 2001 From: "taeyoon0.lee" Date: Fri, 24 Nov 2017 15:13:58 +0900 Subject: [PATCH] Revert "[4.0] Added const for IsVideoTextureSupported" This will be temporary patch for TV emul. This reverts commit 5389f9445b6b6cb556b2c9306ea23467ddf70331. Change-Id: Ibe821b0ab66cc18d01a7ac59cdcb74f093f3e9f9 --- adaptors/common/video-player-impl.cpp | 2 +- adaptors/common/video-player-impl.h | 2 +- adaptors/devel-api/adaptor-framework/video-player-plugin.h | 2 +- adaptors/devel-api/adaptor-framework/video-player.cpp | 2 +- adaptors/devel-api/adaptor-framework/video-player.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/adaptors/common/video-player-impl.cpp b/adaptors/common/video-player-impl.cpp index 7a66095..0807e2a 100644 --- a/adaptors/common/video-player-impl.cpp +++ b/adaptors/common/video-player-impl.cpp @@ -289,7 +289,7 @@ void VideoPlayer::Backward( int millisecond ) } } -bool VideoPlayer::IsVideoTextureSupported() const +bool VideoPlayer::IsVideoTextureSupported() { if( mPlugin != NULL ) { diff --git a/adaptors/common/video-player-impl.h b/adaptors/common/video-player-impl.h index eaaa2fb..498a761 100644 --- a/adaptors/common/video-player-impl.h +++ b/adaptors/common/video-player-impl.h @@ -162,7 +162,7 @@ public: /** * @brief Dali::VideoPlayer::IsVideoTextureSupported() */ - bool IsVideoTextureSupported() const; + 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 f1c309b..10a6d5d 100644 --- a/adaptors/devel-api/adaptor-framework/video-player-plugin.h +++ b/adaptors/devel-api/adaptor-framework/video-player-plugin.h @@ -215,7 +215,7 @@ public: * @brief Checks whether the video texture is supported * @return True if supported, otherwise false. */ - virtual bool IsVideoTextureSupported() const = 0; + virtual bool IsVideoTextureSupported() = 0; }; diff --git a/adaptors/devel-api/adaptor-framework/video-player.cpp b/adaptors/devel-api/adaptor-framework/video-player.cpp index 281ae39..048a9f0 100644 --- a/adaptors/devel-api/adaptor-framework/video-player.cpp +++ b/adaptors/devel-api/adaptor-framework/video-player.cpp @@ -171,7 +171,7 @@ void VideoPlayer::Backward( int millisecond ) GetImplementation( *this ).Backward( millisecond ); } -bool VideoPlayer::IsVideoTextureSupported() const +bool VideoPlayer::IsVideoTextureSupported() { return GetImplementation( *this ).IsVideoTextureSupported(); } diff --git a/adaptors/devel-api/adaptor-framework/video-player.h b/adaptors/devel-api/adaptor-framework/video-player.h index f548ab1..c630c72 100644 --- a/adaptors/devel-api/adaptor-framework/video-player.h +++ b/adaptors/devel-api/adaptor-framework/video-player.h @@ -245,7 +245,7 @@ public: * @brief Checks whether the video texture is supported * @return True if supported, otherwise false. */ - bool IsVideoTextureSupported() const; + bool IsVideoTextureSupported(); private: // Not intended for application developers -- 2.7.4