(VectorRenderer) Add a method to get a default size

Change-Id: Ia1b19695bcf3a9f8b71ed3bf5627c135911e645b

diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h b/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h
index b371733616d6f0c3931eb54a385180d82466def9..a9f25c681d544b5e1e50c150edc928eec73402af 100644 (file)
--- a/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h
+++ b/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h
@@ -45,11 +45,11 @@ public:
   virtual ~VectorAnimationRendererPlugin() {}
 
   /**
-   * @brief Sets the url of the animation file.
+   * @brief Second-phase constructor.
    *
    * @param[in] url The url of the animation file
    */
-  virtual void SetUrl( const std::string& url ) = 0;
+  virtual bool Initialize( const std::string& url ) = 0;
 
   /**
    * @brief Sets the renderer used to display the result image.
@@ -66,13 +66,6 @@ public:
    */
   virtual void SetSize( uint32_t width, uint32_t height ) = 0;
 
-  /**
-   * @brief Starts the rendering.
-   *
-   * @return True if the renderer is successfully started, false otherwise
-   */
-  virtual bool StartRender() = 0;
-
   /**
    * @brief Stops the rendering.
    */
@@ -99,6 +92,13 @@ public:
    */
   virtual float GetFrameRate() const = 0;
 
+  /**
+   * @brief Gets the default size of the file,.
+   *
+   * @return The default size of the file
+   */
+  virtual void GetDefaultSize( uint32_t& width, uint32_t& height ) const = 0;
+
   /**
    * @brief Function pointer called in adaptor to create a plugin instance.
    */

diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp b/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp
index c02bc162e750c21343f87b321c69946bf5f43ea6..e7f81293051f49df2c9b8a005db6be06e119a758 100755 (executable)
--- a/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp
+++ b/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp
@@ -69,11 +69,6 @@ void VectorAnimationRenderer::SetSize( uint32_t width, uint32_t height )
   GetImplementation( *this ).SetSize( width, height );
 }
 
-bool VectorAnimationRenderer::StartRender()
-{
-  return GetImplementation( *this ).StartRender();
-}
-
 void VectorAnimationRenderer::StopRender()
 {
   GetImplementation( *this ).StopRender();
@@ -94,4 +89,9 @@ float VectorAnimationRenderer::GetFrameRate() const
   return GetImplementation( *this ).GetFrameRate();
 }
 
+void VectorAnimationRenderer::GetDefaultSize( uint32_t& width, uint32_t& height ) const
+{
+  GetImplementation( *this ).GetDefaultSize( width, height );
+}
+
 } // namespace Dali

diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer.h b/dali/devel-api/adaptor-framework/vector-animation-renderer.h
index f7faf2143e44c1c292ad8bc6f3e0ddde85714feb..abb911e45ac7e90b87c9bf18b0b61bb551ce1689 100755 (executable)
--- a/dali/devel-api/adaptor-framework/vector-animation-renderer.h
+++ b/dali/devel-api/adaptor-framework/vector-animation-renderer.h
@@ -96,13 +96,6 @@ public:
    */
   void SetSize( uint32_t width, uint32_t height );
 
-  /**
-   * @brief Starts the rendering.
-   *
-   * @return True if the renderer is successfully started, false otherwise.
-   */
-  bool StartRender();
-
   /**
    * @brief Stops the rendering.
    */
@@ -129,6 +122,13 @@ public:
    */
   float GetFrameRate() const;
 
+  /**
+   * @brief Gets the default size of the file,.
+   *
+   * @return The default size of the file
+   */
+  void GetDefaultSize( uint32_t& width, uint32_t& height ) const;
+
 public: // Signals
 
 public: // Not intended for application developers

diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp b/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp
index 0ff6586e86f954c297a2db88f4793675d64d8785..3f1d9eae36138f37366e0d7d4425888d66f83eab 100644 (file)
--- a/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp
+++ b/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp
@@ -62,7 +62,7 @@ VectorAnimationRenderer::~VectorAnimationRenderer()
 
 void VectorAnimationRenderer::Initialize( const std::string& url )
 {
-  mPlugin.SetUrl( url );
+  mPlugin.Initialize( url );
 }
 
 void VectorAnimationRenderer::SetRenderer( Dali::Renderer renderer )
@@ -75,11 +75,6 @@ void VectorAnimationRenderer::SetSize( uint32_t width, uint32_t height )
   mPlugin.SetSize( width, height );
 }
 
-bool VectorAnimationRenderer::StartRender()
-{
-  return mPlugin.StartRender();
-}
-
 void VectorAnimationRenderer::StopRender()
 {
   mPlugin.StopRender();
@@ -100,6 +95,11 @@ float VectorAnimationRenderer::GetFrameRate() const
   return mPlugin.GetFrameRate();
 }
 
+void VectorAnimationRenderer::GetDefaultSize( uint32_t& width, uint32_t& height ) const
+{
+  mPlugin.GetDefaultSize( width, height );
+}
+
 } // namespace Adaptor
 
 } // namespace internal

diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-impl.h b/dali/internal/vector-animation/common/vector-animation-renderer-impl.h
index d3e53b4483c4472f34096c3f9df196c354d0ce4f..56ab9b2c9f5af533324a65f9d30253361635077e 100755 (executable)
--- a/dali/internal/vector-animation/common/vector-animation-renderer-impl.h
+++ b/dali/internal/vector-animation/common/vector-animation-renderer-impl.h
@@ -66,11 +66,6 @@ public:
    */
   void SetSize( uint32_t width, uint32_t height );
 
-  /**
-   * @copydoc Dali::VectorAnimationRenderer::StartRender()
-   */
-  bool StartRender();
-
   /**
    * @copydoc Dali::VectorAnimationRenderer::StopRender()
    */
@@ -91,6 +86,11 @@ public:
    */
   float GetFrameRate() const;
 
+  /**
+   * @copydoc Dali::VectorAnimationRenderer::GetDefaultSize()
+   */
+  void GetDefaultSize( uint32_t& width, uint32_t& height ) const;
+
 private:
 
   /**

diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp
index 6217e1d2e0d602558316c3da755d3853400ae3e5..dff90c332983b86c8a2caeb0ab622b1c57effba2 100644 (file)
--- a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp
+++ b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp
@@ -100,12 +100,13 @@ void VectorAnimationRendererPluginProxy::Initialize()
   }
 }
 
-void VectorAnimationRendererPluginProxy::SetUrl( const std::string& url )
+bool VectorAnimationRendererPluginProxy::Initialize( const std::string& url )
 {
   if( mPlugin )
   {
-    mPlugin->SetUrl( url );
+    return mPlugin->Initialize( url );
   }
+  return false;
 }
 
 void VectorAnimationRendererPluginProxy::SetRenderer( Dali::Renderer renderer )
@@ -124,15 +125,6 @@ void VectorAnimationRendererPluginProxy::SetSize( uint32_t width, uint32_t heigh
   }
 }
 
-bool VectorAnimationRendererPluginProxy::StartRender()
-{
-  if( mPlugin )
-  {
-    return mPlugin->StartRender();
-  }
-  return false;
-}
-
 void VectorAnimationRendererPluginProxy::StopRender()
 {
   if( mPlugin )
@@ -167,6 +159,14 @@ float VectorAnimationRendererPluginProxy::GetFrameRate() const
   return 0.0f;
 }
 
+void VectorAnimationRendererPluginProxy::GetDefaultSize( uint32_t& width, uint32_t& height ) const
+{
+  if( mPlugin )
+  {
+    mPlugin->GetDefaultSize( width, height );
+  }
+}
+
 } // namespace Adaptor
 
 } // namespace Internal

diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h
index 30e0da35fca5b44ad17069b21b3c64e4f3145ad9..119c0c4b25c3a1a584f60c7050b79cdc77fcd4f4 100644 (file)
--- a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h
+++ b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h
@@ -48,9 +48,9 @@ public:
   ~VectorAnimationRendererPluginProxy();
 
   /**
-   * @copydoc Dali::VectorAnimationRendererPlugin::SetUrl()
+   * @copydoc Dali::VectorAnimationRendererPlugin::Initialize()
    */
-  void SetUrl( const std::string& url );
+  bool Initialize( const std::string& url );
 
   /**
    * @copydoc Dali::VectorAnimationRendererPlugin::SetRenderer()
@@ -62,11 +62,6 @@ public:
    */
   void SetSize( uint32_t width, uint32_t height );
 
-  /**
-   * @copydoc Dali::VectorAnimationRendererPlugin::StartRender()
-   */
-  bool StartRender();
-
   /**
    * @copydoc Dali::VectorAnimationRendererPlugin::StopRender()
    */
@@ -87,6 +82,11 @@ public:
    */
   float GetFrameRate() const;
 
+  /**
+   * @copydoc Dali::VectorAnimationRendererPlugin::GetDefaultSize()
+   */
+  void GetDefaultSize( uint32_t& width, uint32_t& height ) const;
+
   // Not copyable or movable
   VectorAnimationRendererPluginProxy( const VectorAnimationRendererPluginProxy& ) = delete; ///< Deleted copy constructor
   VectorAnimationRendererPluginProxy( VectorAnimationRendererPluginProxy&& ) = delete; ///< Deleted move constructor