Change RegisterGlCallback function name of GlView

It is changed to RegisterGlCallbacks because the function registers 3
callbacks.

Change-Id: If326d9f325a5a861db2efd3a1f3d50262d678eae

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-GlView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-GlView.cpp
index 9f74b72..9cefe16 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-GlView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-GlView.cpp
@@ -181,15 +181,15 @@ void resizeCB(Vector2 size)
 {
 }
 
-int UtcDaliGlViewRegisterGlCallbackN(void)
+int UtcDaliGlViewRegisterGlCallbacksN(void)
 {
   ToolkitTestApplication application;
-  tet_infoline("UtcDaliGlViewRegisterGlCallback");
+  tet_infoline("UtcDaliGlViewRegisterGlCallbacksN");
   GlView view;
 
   try
   {
-    view.RegisterGlCallback(Dali::MakeCallback(glInit), Dali::MakeCallback(glRenderFrame), Dali::MakeCallback(glTerminate));
+    view.RegisterGlCallbacks(Dali::MakeCallback(glInit), Dali::MakeCallback(glRenderFrame), Dali::MakeCallback(glTerminate));
     DALI_TEST_CHECK(false);
   }
   catch(...)
@@ -243,7 +243,7 @@ int UtcDaliGlViewWindowVisibilityChanged(void)
   application.GetScene().Add( view );
   view.SetRenderingMode(GlView::RenderingMode::CONTINUOUS);
   view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_2_0);
-  view.RegisterGlCallback(Dali::MakeCallback(glInit), Dali::MakeCallback(glRenderFrame), Dali::MakeCallback(glTerminate));
+  view.RegisterGlCallbacks(Dali::MakeCallback(glInit), Dali::MakeCallback(glRenderFrame), Dali::MakeCallback(glTerminate));
   view.SetResizeCallback(Dali::MakeCallback(resizeCB));
 
   application.SendNotification();
@@ -268,7 +268,7 @@ int UtcDaliGlViewOnScene(void)
   application.GetScene().Add( view );
   view.SetRenderingMode(GlView::RenderingMode::CONTINUOUS);
   view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_2_0);
-  view.RegisterGlCallback(Dali::MakeCallback(glInit), Dali::MakeCallback(glRenderFrame), Dali::MakeCallback(glTerminate));
+  view.RegisterGlCallbacks(Dali::MakeCallback(glInit), Dali::MakeCallback(glRenderFrame), Dali::MakeCallback(glTerminate));
 
   application.SendNotification();
   application.Render();
@@ -314,7 +314,7 @@ int UtcDaliGlViewResize(void)
 
   application.GetScene().Add( view );
   view.SetGraphicsConfig(true, true, 0, GlView::GraphicsApiVersion::GLES_VERSION_2_0);
-  view.RegisterGlCallback(Dali::MakeCallback(glInit), Dali::MakeCallback(glRenderFrame), Dali::MakeCallback(glTerminate));
+  view.RegisterGlCallbacks(Dali::MakeCallback(glInit), Dali::MakeCallback(glRenderFrame), Dali::MakeCallback(glTerminate));
   view.SetResizeCallback(Dali::MakeCallback(resizeCB));
   view.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
   view.SetProperty(Actor::Property::SIZE, Vector2(360.0f, 360.0f));

diff --git a/dali-toolkit/internal/controls/gl-view/gl-view-impl.cpp b/dali-toolkit/internal/controls/gl-view/gl-view-impl.cpp
index 64e31d6..b37189a 100644 (file)
--- a/dali-toolkit/internal/controls/gl-view/gl-view-impl.cpp
+++ b/dali-toolkit/internal/controls/gl-view/gl-view-impl.cpp
@@ -67,11 +67,11 @@ GlView::~GlView()
   }
 }
 
-void GlView::RegisterGlCallback(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback)
+void GlView::RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback)
 {
   if(mRenderThread)
   {
-    mRenderThread->RegisterGlCallback(initCallback, renderFrameCallback, terminateCallback);
+    mRenderThread->RegisterGlCallbacks(initCallback, renderFrameCallback, terminateCallback);
   }
 }
 

diff --git a/dali-toolkit/internal/controls/gl-view/gl-view-impl.h b/dali-toolkit/internal/controls/gl-view/gl-view-impl.h
index c0114ca..2dcb0b1 100644 (file)
--- a/dali-toolkit/internal/controls/gl-view/gl-view-impl.h
+++ b/dali-toolkit/internal/controls/gl-view/gl-view-impl.h
@@ -55,9 +55,9 @@ public:
   GlView(Dali::Toolkit::GlView::ColorFormat colorFormat);
 
   /**
-   * @copydoc Dali::Toolkit::GlView::RegisterGlCallback()
+   * @copydoc Dali::Toolkit::GlView::RegisterGlCallbacks()
    */
-  void RegisterGlCallback(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback);
+  void RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback);
 
   /**
    * @copydoc Dali::Toolkit::GlView::SetResizeCallback()

diff --git a/dali-toolkit/internal/controls/gl-view/gl-view-render-thread.cpp b/dali-toolkit/internal/controls/gl-view/gl-view-render-thread.cpp
index db2e98c..3e84cfd 100644 (file)
--- a/dali-toolkit/internal/controls/gl-view/gl-view-render-thread.cpp
+++ b/dali-toolkit/internal/controls/gl-view/gl-view-render-thread.cpp
@@ -72,7 +72,7 @@ GlViewRenderThread::GlViewRenderThread(Dali::NativeImageSourceQueuePtr queue)
   }
 }
 
-void GlViewRenderThread::RegisterGlCallback(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback)
+void GlViewRenderThread::RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback)
 {
   if(!mGlInitCallback && !mGlRenderFrameCallback && !mGlTerminateCallback)
   {

diff --git a/dali-toolkit/internal/controls/gl-view/gl-view-render-thread.h b/dali-toolkit/internal/controls/gl-view/gl-view-render-thread.h
index c27c832..753526e 100644 (file)
--- a/dali-toolkit/internal/controls/gl-view/gl-view-render-thread.h
+++ b/dali-toolkit/internal/controls/gl-view/gl-view-render-thread.h
@@ -54,9 +54,9 @@ public:
   virtual ~GlViewRenderThread();
 
   /**
-   * @copydoc Dali::Toolkit::GlView::RegisterGlCallback()
+   * @copydoc Dali::Toolkit::GlView::RegisterGlCallbacks()
    */
-  void RegisterGlCallback(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback);
+  void RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback);
 
   /**
    * @copydoc Dali::Toolkit::GlView::SetResizeCallback()

diff --git a/dali-toolkit/public-api/controls/gl-view/gl-view.cpp b/dali-toolkit/public-api/controls/gl-view/gl-view.cpp
index b5f6a8c..958d031 100644 (file)
--- a/dali-toolkit/public-api/controls/gl-view/gl-view.cpp
+++ b/dali-toolkit/public-api/controls/gl-view/gl-view.cpp
@@ -51,9 +51,9 @@ GlView GlView::DownCast(BaseHandle handle)
   return Control::DownCast<GlView, Internal::GlView>(handle);
 }
 
-void GlView::RegisterGlCallback(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback)
+void GlView::RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback)
 {
-  Dali::Toolkit::GetImpl(*this).RegisterGlCallback(initCallback, renderFrameCallback, terminateCallback);
+  Dali::Toolkit::GetImpl(*this).RegisterGlCallbacks(initCallback, renderFrameCallback, terminateCallback);
 }
 
 void GlView::SetResizeCallback(CallbackBase* resizeCallback)

diff --git a/dali-toolkit/public-api/controls/gl-view/gl-view.h b/dali-toolkit/public-api/controls/gl-view/gl-view.h
index be13db9..57c3201 100644 (file)
--- a/dali-toolkit/public-api/controls/gl-view/gl-view.h
+++ b/dali-toolkit/public-api/controls/gl-view/gl-view.h
@@ -165,7 +165,7 @@ public:
    * <b>You can't call Dali APIs in your callbacks because it is invoked in GlView's own render thread.</b>
    * And this must be called before adding GlView to the scene.
    */
-  void RegisterGlCallback(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback);
+  void RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback);
 
   /**
    * @brief Sets the ResizeCallback of the GlView.