Merge "Added an devel-API to check whether video texture is supported" into devel...

diff --git a/adaptors/common/video-player-impl.cpp b/adaptors/common/video-player-impl.cpp
index 50e3e6b..7a66095 100644 (file)
--- a/adaptors/common/video-player-impl.cpp
+++ b/adaptors/common/video-player-impl.cpp
@@ -289,6 +289,16 @@ void VideoPlayer::Backward( int millisecond )
   }
 }
 
+bool VideoPlayer::IsVideoTextureSupported() const
+{
+  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 e37b5f6..eaaa2fb 100644 (file)
--- a/adaptors/common/video-player-impl.h
+++ b/adaptors/common/video-player-impl.h
@@ -159,6 +159,11 @@ public:
    */
   void Backward( int millisecond );
 
+  /**
+   * @brief Dali::VideoPlayer::IsVideoTextureSupported()
+   */
+  bool IsVideoTextureSupported() const;
+
 private:
 
   /**

diff --git a/adaptors/devel-api/adaptor-framework/video-player-plugin.h b/adaptors/devel-api/adaptor-framework/video-player-plugin.h
index 4bbcc04..f1c309b 100644 (file)
--- a/adaptors/devel-api/adaptor-framework/video-player-plugin.h
+++ b/adaptors/devel-api/adaptor-framework/video-player-plugin.h
@@ -211,6 +211,12 @@ public:
    */
   virtual void Backward( int millisecond ) = 0;
 
+  /**
+   * @brief Checks whether the video texture is supported
+   * @return True if supported, otherwise false.
+   */
+  virtual bool IsVideoTextureSupported() const = 0;
+
 };
 
 } // namespace Dali;

diff --git a/adaptors/devel-api/adaptor-framework/video-player.cpp b/adaptors/devel-api/adaptor-framework/video-player.cpp
index fb4b2a2..281ae39 100644 (file)
--- a/adaptors/devel-api/adaptor-framework/video-player.cpp
+++ b/adaptors/devel-api/adaptor-framework/video-player.cpp
@@ -171,5 +171,10 @@ void VideoPlayer::Backward( int millisecond )
   GetImplementation( *this ).Backward( millisecond );
 }
 
+bool VideoPlayer::IsVideoTextureSupported() const
+{
+  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 8c69719..f548ab1 100644 (file)
--- a/adaptors/devel-api/adaptor-framework/video-player.h
+++ b/adaptors/devel-api/adaptor-framework/video-player.h
@@ -241,6 +241,12 @@ public:
    */
   void Backward( int millisecond );
 
+  /**
+   * @brief Checks whether the video texture is supported
+   * @return True if supported, otherwise false.
+   */
+  bool IsVideoTextureSupported() const;
+
 private: // Not intended for application developers
 
   /**