[dali_1.0.7] Merge branch 'tizen'

[platform/core/uifw/dali-core.git] / dali / integration-api / core.cpp

diff --git a/dali/integration-api/core.cpp b/dali/integration-api/core.cpp
index a6c13f6..f698eee 100644 (file)
--- a/dali/integration-api/core.cpp
+++ b/dali/integration-api/core.cpp
@@ -1,18 +1,19 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // CLASS HEADER
 #include <dali/integration-api/core.h>
@@ -84,11 +85,6 @@ void Core::SetDpi(unsigned int dpiHorizontal, unsigned int dpiVertical)
   mImpl->SetDpi(dpiHorizontal, dpiVertical);
 }
 
-void Core::SetMinimumFrameTimeInterval(unsigned int interval)
-{
-  mImpl->SetMinimumFrameTimeInterval(interval);
-}
-
 void Core::Suspend()
 {
   mImpl->Suspend();
@@ -119,9 +115,9 @@ unsigned int Core::GetMaximumUpdateCount() const
   return mImpl->GetMaximumUpdateCount();
 }
 
-void Core::Update( UpdateStatus& status )
+void Core::Update( float elapsedSeconds, unsigned int lastVSyncTimeMilliseconds, unsigned int nextVSyncTimeMilliseconds, UpdateStatus& status )
 {
-  mImpl->Update( status );
+  mImpl->Update( elapsedSeconds, lastVSyncTimeMilliseconds, nextVSyncTimeMilliseconds, status );
 }
 
 void Core::Render( RenderStatus& status )
@@ -129,21 +125,6 @@ void Core::Render( RenderStatus& status )
   mImpl->Render( status );
 }
 
-void Core::Sleep()
-{
-  mImpl->Sleep();
-}
-
-void Core::WakeUp()
-{
-  mImpl->WakeUp();
-}
-
-void Core::VSync( unsigned int frameNumber, unsigned int seconds, unsigned int microseconds )
-{
-  mImpl->VSync( frameNumber, seconds, microseconds );
-}
-
 SystemOverlay& Core::GetSystemOverlay()
 {
   return mImpl->GetSystemOverlay();