From 1b538ffac8f1c2d6c14e29438bcfd84040da3d25 Mon Sep 17 00:00:00 2001 From: taeyoon Date: Fri, 13 Mar 2015 18:16:28 +0900 Subject: [PATCH] Change "SLP" to "Tizen" Change-Id: Iacd1068df9929178887c3dff429161f851c2f7a4 --- adaptors/common/adaptor-impl.cpp | 8 +- adaptors/common/adaptor-impl.h | 4 +- adaptors/common/application-impl.cpp | 4 +- adaptors/common/bitmap-loader-impl.cpp | 2 +- adaptors/common/framework.h | 2 +- adaptors/common/singleton-service-impl.cpp | 4 +- .../public-api/adaptor-framework/bitmap-saver.cpp | 12 +-- adaptors/wayland/pixmap-image-impl-wl.cpp | 2 +- .../src/dali-adaptor-internal/image-loaders.cpp | 2 +- .../src/dali-adaptor-internal/image-loaders.h | 4 +- .../dali-adaptor-internal/utc-Dali-GifLoader.cpp | 4 +- .../src/dali-platform-abstraction/CMakeLists.txt | 2 +- .../resource-collector.cpp | 2 +- .../utc-image-loading-common.h | 2 +- build/tizen/adaptor/Makefile.am | 20 ++--- build/tizen/configure.ac | 2 +- platform-abstractions/slp/file.list | 47 ------------ .../{slp => tizen}/data-cache/data-cache-impl.cpp | 6 +- .../{slp => tizen}/data-cache/data-cache-impl.h | 10 +-- .../{slp => tizen}/data-cache/data-cache-io.cpp | 4 +- .../{slp => tizen}/data-cache/data-cache-io.h | 10 +-- .../{slp => tizen}/data-cache/data-compression.cpp | 4 +- .../{slp => tizen}/data-cache/data-compression.h | 10 +-- .../{slp => tizen}/data-cache/metrics-cache.cpp | 4 +- .../{slp => tizen}/data-cache/metrics-cache.h | 8 +- .../data-cache/tests/data-cache-debug.cpp | 4 +- .../data-cache/tests/data-cache-debug.h | 10 +-- .../{slp => tizen}/dynamics/dynamics-factory.cpp | 4 +- .../{slp => tizen}/dynamics/dynamics-factory.h | 4 +- platform-abstractions/tizen/file.list | 47 ++++++++++++ .../font-platform/font-controller-impl.cpp | 6 +- .../font-platform/font-controller-impl.h | 12 +-- .../{slp => tizen}/image-loaders/image-loader.cpp | 4 +- .../{slp => tizen}/image-loaders/image-loader.h | 10 +-- .../{slp => tizen}/image-loaders/loader-bmp.cpp | 4 +- .../{slp => tizen}/image-loaders/loader-bmp.h | 10 +-- .../{slp => tizen}/image-loaders/loader-gif.cpp | 4 +- .../{slp => tizen}/image-loaders/loader-gif.h | 10 +-- .../{slp => tizen}/image-loaders/loader-ico.cpp | 2 +- .../{slp => tizen}/image-loaders/loader-ico.h | 6 +- .../image-loaders/loader-jpeg-turbo.cpp | 4 +- .../{slp => tizen}/image-loaders/loader-jpeg.cpp | 4 +- .../{slp => tizen}/image-loaders/loader-jpeg.h | 10 +-- .../{slp => tizen}/image-loaders/loader-ktx.cpp | 4 +- .../{slp => tizen}/image-loaders/loader-ktx.h | 10 +-- .../{slp => tizen}/image-loaders/loader-png.cpp | 6 +- .../{slp => tizen}/image-loaders/loader-png.h | 10 +-- .../{slp => tizen}/image-loaders/loader-wbmp.cpp | 2 +- .../{slp => tizen}/image-loaders/loader-wbmp.h | 6 +- .../debug/resource-loader-debug.cpp | 4 +- .../resource-loader/debug/resource-loader-debug.h | 12 +-- .../{slp => tizen}/resource-loader/image-encoder.h | 6 +- .../{slp => tizen}/resource-loader/loader-font.cpp | 50 ++++++------- .../{slp => tizen}/resource-loader/loader-font.h | 24 +++--- .../resource-loader/platform-capabilities.h | 10 +-- .../resource-loader/resource-bitmap-requester.cpp | 4 +- .../resource-loader/resource-bitmap-requester.h | 10 +-- .../resource-loader/resource-loader.cpp | 48 ++++++------ .../resource-loader/resource-loader.h | 20 ++--- .../resource-loader/resource-loading-client.h | 4 +- .../resource-loader/resource-requester-base.cpp | 4 +- .../resource-loader/resource-requester-base.h | 12 +-- .../resource-loader/resource-shader-requester.cpp | 4 +- .../resource-loader/resource-shader-requester.h | 10 +-- .../resource-loader/resource-text-requester.cpp | 4 +- .../resource-loader/resource-text-requester.h | 12 +-- .../resource-loader/resource-thread-base.cpp | 10 +-- .../resource-loader/resource-thread-base.h | 10 +-- .../resource-loader/resource-thread-image.cpp | 4 +- .../resource-loader/resource-thread-image.h | 10 +-- .../resource-loader/resource-thread-shader.cpp | 4 +- .../resource-loader/resource-thread-shader.h | 10 +-- .../resource-loader/resource-thread-text.cpp | 4 +- .../resource-loader/resource-thread-text.h | 10 +-- .../tizen-font-configuration-parser.cpp} | 8 +- .../tizen-font-configuration-parser.h} | 10 +-- .../slp-logging.cpp => tizen/tizen-logging.cpp} | 6 +- .../{slp/slp-logging.h => tizen/tizen-logging.h} | 10 +-- .../tizen-platform-abstraction.cpp} | 86 +++++++++++----------- .../tizen-platform-abstraction.h} | 16 ++-- 80 files changed, 404 insertions(+), 404 deletions(-) delete mode 100755 platform-abstractions/slp/file.list rename platform-abstractions/{slp => tizen}/data-cache/data-cache-impl.cpp (99%) rename platform-abstractions/{slp => tizen}/data-cache/data-cache-impl.h (97%) rename platform-abstractions/{slp => tizen}/data-cache/data-cache-io.cpp (99%) rename platform-abstractions/{slp => tizen}/data-cache/data-cache-io.h (97%) rename platform-abstractions/{slp => tizen}/data-cache/data-compression.cpp (98%) rename platform-abstractions/{slp => tizen}/data-cache/data-compression.h (91%) rename platform-abstractions/{slp => tizen}/data-cache/metrics-cache.cpp (99%) rename platform-abstractions/{slp => tizen}/data-cache/metrics-cache.h (94%) rename platform-abstractions/{slp => tizen}/data-cache/tests/data-cache-debug.cpp (99%) rename platform-abstractions/{slp => tizen}/data-cache/tests/data-cache-debug.h (84%) rename platform-abstractions/{slp => tizen}/dynamics/dynamics-factory.cpp (98%) rename platform-abstractions/{slp => tizen}/dynamics/dynamics-factory.h (97%) create mode 100755 platform-abstractions/tizen/file.list rename platform-abstractions/{slp => tizen}/font-platform/font-controller-impl.cpp (99%) rename platform-abstractions/{slp => tizen}/font-platform/font-controller-impl.h (97%) rename platform-abstractions/{slp => tizen}/image-loaders/image-loader.cpp (99%) rename platform-abstractions/{slp => tizen}/image-loaders/image-loader.h (92%) rename platform-abstractions/{slp => tizen}/image-loaders/loader-bmp.cpp (99%) rename platform-abstractions/{slp => tizen}/image-loaders/loader-bmp.h (91%) rename platform-abstractions/{slp => tizen}/image-loaders/loader-gif.cpp (99%) rename platform-abstractions/{slp => tizen}/image-loaders/loader-gif.h (91%) rename platform-abstractions/{slp => tizen}/image-loaders/loader-ico.cpp (99%) rename platform-abstractions/{slp => tizen}/image-loaders/loader-ico.h (90%) rename platform-abstractions/{slp => tizen}/image-loaders/loader-jpeg-turbo.cpp (99%) rename platform-abstractions/{slp => tizen}/image-loaders/loader-jpeg.cpp (99%) rename platform-abstractions/{slp => tizen}/image-loaders/loader-jpeg.h (93%) rename platform-abstractions/{slp => tizen}/image-loaders/loader-ktx.cpp (99%) rename platform-abstractions/{slp => tizen}/image-loaders/loader-ktx.h (91%) rename platform-abstractions/{slp => tizen}/image-loaders/loader-png.cpp (99%) rename platform-abstractions/{slp => tizen}/image-loaders/loader-png.h (93%) rename platform-abstractions/{slp => tizen}/image-loaders/loader-wbmp.cpp (99%) rename platform-abstractions/{slp => tizen}/image-loaders/loader-wbmp.h (89%) rename platform-abstractions/{slp => tizen}/resource-loader/debug/resource-loader-debug.cpp (98%) rename platform-abstractions/{slp => tizen}/resource-loader/debug/resource-loader-debug.h (77%) rename platform-abstractions/{slp => tizen}/resource-loader/image-encoder.h (84%) rename platform-abstractions/{slp => tizen}/resource-loader/loader-font.cpp (92%) rename platform-abstractions/{slp => tizen}/resource-loader/loader-font.h (88%) rename platform-abstractions/{slp => tizen}/resource-loader/platform-capabilities.h (88%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-bitmap-requester.cpp (98%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-bitmap-requester.h (90%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-loader.cpp (95%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-loader.h (95%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-loading-client.h (97%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-requester-base.cpp (94%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-requester-base.h (90%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-shader-requester.cpp (97%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-shader-requester.h (90%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-text-requester.cpp (98%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-text-requester.h (87%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-thread-base.cpp (97%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-thread-base.h (95%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-thread-image.cpp (99%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-thread-image.h (92%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-thread-shader.cpp (98%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-thread-shader.h (85%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-thread-text.cpp (99%) rename platform-abstractions/{slp => tizen}/resource-loader/resource-thread-text.h (95%) rename platform-abstractions/{slp/slp-font-configuration-parser.cpp => tizen/tizen-font-configuration-parser.cpp} (96%) rename platform-abstractions/{slp/slp-font-configuration-parser.h => tizen/tizen-font-configuration-parser.h} (83%) rename platform-abstractions/{slp/slp-logging.cpp => tizen/tizen-logging.cpp} (96%) rename platform-abstractions/{slp/slp-logging.h => tizen/tizen-logging.h} (84%) rename platform-abstractions/{slp/slp-platform-abstraction.cpp => tizen/tizen-platform-abstraction.cpp} (71%) rename platform-abstractions/{slp/slp-platform-abstraction.h => tizen/tizen-platform-abstraction.h} (96%) diff --git a/adaptors/common/adaptor-impl.cpp b/adaptors/common/adaptor-impl.cpp index 497a816..e32ae32 100644 --- a/adaptors/common/adaptor-impl.cpp +++ b/adaptors/common/adaptor-impl.cpp @@ -55,7 +55,7 @@ #include #include -#include +#include @@ -135,8 +135,8 @@ void Adaptor::ParseEnvironmentOptions() unsigned int logPanGesture = GetIntegerEnvironmentVariable( DALI_ENV_LOG_PAN_GESTURE, 0 ); - // all threads here (event, update, and render) will send their logs to SLP Platform's LogMessage handler. - Dali::Integration::Log::LogFunction logFunction(Dali::SlpPlatform::LogMessage); + // all threads here (event, update, and render) will send their logs to TIZEN Platform's LogMessage handler. + Dali::Integration::Log::LogFunction logFunction(Dali::TizenPlatform::LogMessage); mEnvironmentOptions.SetLogOptions( logFunction, logFrameRateFrequency, logupdateStatusFrequency, logPerformanceStats, logPerformanceStatsFrequency, performanceTimeStampOutput, logPanGesture ); @@ -222,7 +222,7 @@ void Adaptor::Initialize(Dali::Configuration::ContextLoss configuration) { ParseEnvironmentOptions(); - mPlatformAbstraction = new SlpPlatform::SlpPlatformAbstraction; + mPlatformAbstraction = new TizenPlatform::TizenPlatformAbstraction; std::string path; GetDataStoragePath( path ); diff --git a/adaptors/common/adaptor-impl.h b/adaptors/common/adaptor-impl.h index 1e5c2ac..63b3463 100644 --- a/adaptors/common/adaptor-impl.h +++ b/adaptors/common/adaptor-impl.h @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include @@ -503,7 +503,7 @@ private: // Data EglFactory* mEglFactory; ///< EGL Factory RenderSurface* mSurface; ///< Current surface - SlpPlatform::SlpPlatformAbstraction* mPlatformAbstraction; ///< Platform abstraction + TizenPlatform::TizenPlatformAbstraction* mPlatformAbstraction; ///< Platform abstraction EventHandler* mEventHandler; ///< event handler CallbackManager* mCallbackManager; ///< Used to install callbacks diff --git a/adaptors/common/application-impl.cpp b/adaptors/common/application-impl.cpp index 05f668e..dfb9f12 100644 --- a/adaptors/common/application-impl.cpp +++ b/adaptors/common/application-impl.cpp @@ -31,9 +31,9 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { -class SlpPlatformAbstraction; +class TizenPlatformAbstraction; } namespace Integration diff --git a/adaptors/common/bitmap-loader-impl.cpp b/adaptors/common/bitmap-loader-impl.cpp index 700e121..7aaeb7d 100644 --- a/adaptors/common/bitmap-loader-impl.cpp +++ b/adaptors/common/bitmap-loader-impl.cpp @@ -49,7 +49,7 @@ void BitmapLoader::Initialize(const std::string& filename) { ImageAttributes attributes; Integration::BitmapResourceType bitmapResourceType( attributes ); - Integration::ResourcePointer resource = SlpPlatform::ImageLoader::LoadResourceSynchronously( bitmapResourceType, filename ); + Integration::ResourcePointer resource = TizenPlatform::ImageLoader::LoadResourceSynchronously( bitmapResourceType, filename ); mBitmap = static_cast(resource.Get()); } diff --git a/adaptors/common/framework.h b/adaptors/common/framework.h index 4e414ba5..aca0ec8 100644 --- a/adaptors/common/framework.h +++ b/adaptors/common/framework.h @@ -35,7 +35,7 @@ namespace Adaptor { /** - * The Framework class is used to register callbacks with the SLP platform so that + * The Framework class is used to register callbacks with the TIZEN platform so that * we know when any of the application lifecycle events occur. This includes events * like when our application is to be initialised, terminated, paused, resumed etc. */ diff --git a/adaptors/common/singleton-service-impl.cpp b/adaptors/common/singleton-service-impl.cpp index 63e7dfb..fd33464 100644 --- a/adaptors/common/singleton-service-impl.cpp +++ b/adaptors/common/singleton-service-impl.cpp @@ -25,12 +25,12 @@ // INTERNAL INCLUDES #if defined(DEBUG_ENABLED) -#include +#include Debug::Filter* gSingletonServiceLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_SINGLETON_SERVICE" ); // Need to define own macro as the log function is not installed when this object is created so no logging is shown with DALI_LOG_INFO at construction and destruction #define DALI_LOG_SINGLETON_SERVICE_DIRECT(level, message) \ - if(gSingletonServiceLogFilter && gSingletonServiceLogFilter->IsEnabledFor(level)) { std::string string(message); Dali::SlpPlatform::LogMessage( Debug::DebugInfo, string ); } + if(gSingletonServiceLogFilter && gSingletonServiceLogFilter->IsEnabledFor(level)) { std::string string(message); Dali::TizenPlatform::LogMessage( Debug::DebugInfo, string ); } #define DALI_LOG_SINGLETON_SERVICE(level, format, args...) DALI_LOG_INFO(gSingletonServiceLogFilter, level, format, ## args ) diff --git a/adaptors/public-api/adaptor-framework/bitmap-saver.cpp b/adaptors/public-api/adaptor-framework/bitmap-saver.cpp index 735f40b..2860bff 100644 --- a/adaptors/public-api/adaptor-framework/bitmap-saver.cpp +++ b/adaptors/public-api/adaptor-framework/bitmap-saver.cpp @@ -21,9 +21,9 @@ #include // INTERNAL INCLUDES -#include -#include -#include +#include +#include +#include #include namespace Dali @@ -95,12 +95,12 @@ bool EncodeToFormat( const unsigned char* pixelBuffer, { case JPG_FORMAT: { - return SlpPlatform::EncodeToJpeg( pixelBuffer, encodedPixels, width, height, pixelFormat ); + return TizenPlatform::EncodeToJpeg( pixelBuffer, encodedPixels, width, height, pixelFormat ); break; } case PNG_FORMAT: { - return SlpPlatform::EncodeToPng( pixelBuffer, encodedPixels, width, height, pixelFormat ); + return TizenPlatform::EncodeToPng( pixelBuffer, encodedPixels, width, height, pixelFormat ); break; } default: @@ -129,7 +129,7 @@ bool EncodeToFile(const unsigned char* const pixelBuffer, DALI_LOG_ERROR("Encoding pixels failed"); return false; } - return SlpPlatform::ResourceLoader::SaveFile( filename, pixbufEncoded ); + return TizenPlatform::ResourceLoader::SaveFile( filename, pixbufEncoded ); } } // namespace Dali diff --git a/adaptors/wayland/pixmap-image-impl-wl.cpp b/adaptors/wayland/pixmap-image-impl-wl.cpp index 38c13a1..3ebc0e7 100644 --- a/adaptors/wayland/pixmap-image-impl-wl.cpp +++ b/adaptors/wayland/pixmap-image-impl-wl.cpp @@ -28,7 +28,7 @@ #include // Allow this to be encoded and saved: -#include +#include #include namespace Dali diff --git a/automated-tests/src/dali-adaptor-internal/image-loaders.cpp b/automated-tests/src/dali-adaptor-internal/image-loaders.cpp index 5e09dff..94fdb8a 100644 --- a/automated-tests/src/dali-adaptor-internal/image-loaders.cpp +++ b/automated-tests/src/dali-adaptor-internal/image-loaders.cpp @@ -19,7 +19,7 @@ #include -class StubImageLoaderClient : public Dali::SlpPlatform::ResourceLoadingClient +class StubImageLoaderClient : public Dali::TizenPlatform::ResourceLoadingClient { public: StubImageLoaderClient() {} diff --git a/automated-tests/src/dali-adaptor-internal/image-loaders.h b/automated-tests/src/dali-adaptor-internal/image-loaders.h index 952d8f1..3cf23ae 100644 --- a/automated-tests/src/dali-adaptor-internal/image-loaders.h +++ b/automated-tests/src/dali-adaptor-internal/image-loaders.h @@ -20,7 +20,7 @@ #include #include -#include "platform-abstractions/slp/resource-loader/resource-loading-client.h" +#include "platform-abstractions/tizen/resource-loader/resource-loading-client.h" // Simple structure to close the file when finished with it. struct AutoCloseFile @@ -82,7 +82,7 @@ private: */ struct LoadFunctions { - typedef bool (*LoadBitmapFunction)(FILE*, Dali::Integration::Bitmap&, Dali::ImageAttributes&, const Dali::SlpPlatform::ResourceLoadingClient& client); + typedef bool (*LoadBitmapFunction)(FILE*, Dali::Integration::Bitmap&, Dali::ImageAttributes&, const Dali::TizenPlatform::ResourceLoadingClient& client); typedef bool (*LoadBitmapHeaderFunction)(FILE*, const Dali::ImageAttributes& attrs, unsigned int& width, unsigned int& height ); LoadFunctions( LoadBitmapHeaderFunction _header, LoadBitmapFunction _loader ); diff --git a/automated-tests/src/dali-adaptor-internal/utc-Dali-GifLoader.cpp b/automated-tests/src/dali-adaptor-internal/utc-Dali-GifLoader.cpp index 5a1d881..1093287 100644 --- a/automated-tests/src/dali-adaptor-internal/utc-Dali-GifLoader.cpp +++ b/automated-tests/src/dali-adaptor-internal/utc-Dali-GifLoader.cpp @@ -19,13 +19,13 @@ #include #include -#include "platform-abstractions/slp/image-loaders/loader-gif.h" +#include "platform-abstractions/tizen/image-loaders/loader-gif.h" #include "image-loaders.h" using namespace Dali; namespace { -static const LoadFunctions GifLoaders( SlpPlatform::LoadGifHeader, SlpPlatform::LoadBitmapFromGif ); +static const LoadFunctions GifLoaders( TizenPlatform::LoadGifHeader, TizenPlatform::LoadBitmapFromGif ); } diff --git a/automated-tests/src/dali-platform-abstraction/CMakeLists.txt b/automated-tests/src/dali-platform-abstraction/CMakeLists.txt index cb3adba..69d02a6 100644 --- a/automated-tests/src/dali-platform-abstraction/CMakeLists.txt +++ b/automated-tests/src/dali-platform-abstraction/CMakeLists.txt @@ -39,7 +39,7 @@ INCLUDE_DIRECTORIES( ${${CAPI_LIB}_INCLUDE_DIRS} ../dali-adaptor/dali-test-suite-utils ../../../adaptors/tizen - ../../../platform-abstractions/slp + ../../../platform-abstractions/tizen ../../../ /usr/include/freetype2 ) diff --git a/automated-tests/src/dali-platform-abstraction/resource-collector.cpp b/automated-tests/src/dali-platform-abstraction/resource-collector.cpp index bf95844..0654751 100644 --- a/automated-tests/src/dali-platform-abstraction/resource-collector.cpp +++ b/automated-tests/src/dali-platform-abstraction/resource-collector.cpp @@ -16,7 +16,7 @@ */ #include "resource-collector.h" -#include "slp-platform-abstraction.h" +#include "tizen-platform-abstraction.h" #include namespace Dali diff --git a/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.h b/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.h index 7ca44b3..41edfd8 100644 --- a/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.h +++ b/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.h @@ -22,7 +22,7 @@ #include #include #include -#include "slp-platform-abstraction.h" +#include "tizen-platform-abstraction.h" #include "resource-collector.h" using namespace Dali; diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index 3a4d79e..c671522 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -24,9 +24,9 @@ base_adaptor_src_dir = ../../../adaptors/base include ../../../adaptors/base/file.list # Platform Abstraction -slp_platform_abstraction_src_dir = ../../../platform-abstractions/slp +tizen_platform_abstraction_src_dir = ../../../platform-abstractions/tizen portable_platform_abstraction_src_dir = ../../../platform-abstractions/portable -include ../../../platform-abstractions/slp/file.list +include ../../../platform-abstractions/tizen/file.list # Internal Common adaptor_common_dir = ../../../adaptors/common @@ -70,9 +70,9 @@ include ../../../adaptors/public-api/file.list ############# source files ############# if ASSIMP_ENABLED -slp_platform_abstraction_src_files += $(slp_assimp_src_files) +tizen_platform_abstraction_src_files += $(tizen_assimp_src_files) else -slp_platform_abstraction_src_files += $(slp_assimp_stubs_src_files) +tizen_platform_abstraction_src_files += $(tizen_assimp_stubs_src_files) endif # ASSIMP_ENABLED # COMMON @@ -168,26 +168,26 @@ dalifeedbacktheme_DATA = ${dali_plugin_theme_files} endif if TURBO_JPEG_IS_ON - slp_platform_abstraction_src_files += $(slp_turbo_jpeg_loader) + tizen_platform_abstraction_src_files += $(tizen_turbo_jpeg_loader) else - slp_platform_abstraction_src_files += $(slp_jpeg_loader) + tizen_platform_abstraction_src_files += $(tizen_jpeg_loader) endif lib_LTLIBRARIES = libdali-adaptor.la libdali_adaptor_la_SOURCES = \ $(base_adaptor_src_files) \ - $(slp_platform_abstraction_src_files) \ + $(tizen_platform_abstraction_src_files) \ $(public_api_src_files) \ $(adaptor_internal_src_files) libdali_adaptor_la_DEPENDENCIES = -# List include directories with more platform-specific (slp) before portable root: +# List include directories with more platform-specific (tizen) before portable root: libdali_adaptor_la_includes = \ -I../../.. \ - -I../../../platform-abstractions/slp \ - -I../../../platform-abstractions/slp/resource-loader \ + -I../../../platform-abstractions/tizen \ + -I../../../platform-abstractions/tizen/resource-loader \ -I../../../platform-abstractions/portable \ -I../../../platform-abstractions/ \ -I../../../adaptors/public-api \ diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac index 61ba696..f8e9ad9 100644 --- a/build/tizen/configure.ac +++ b/build/tizen/configure.ac @@ -77,7 +77,7 @@ AC_ARG_ENABLE([feedback], AM_CONDITIONAL([USE_BULLET], [test x$BULLET = xyes && test x$enable_bullet = xyes]) AM_CONDITIONAL([USE_FEEDBACK], [test x$enable_feedback = xyes]) -DALI_ADAPTOR_CFLAGS=-DPLATFORM_SLP +DALI_ADAPTOR_CFLAGS=-DPLATFORM_TIZEN AC_ARG_ENABLE(exportall, [AC_HELP_STRING([--enable-exportall], diff --git a/platform-abstractions/slp/file.list b/platform-abstractions/slp/file.list deleted file mode 100755 index e852554..0000000 --- a/platform-abstractions/slp/file.list +++ /dev/null @@ -1,47 +0,0 @@ -# Add local source files here: - -slp_platform_abstraction_src_files = \ - $(slp_platform_abstraction_src_dir)/slp-platform-abstraction.cpp \ - $(slp_platform_abstraction_src_dir)/slp-logging.cpp \ - $(slp_platform_abstraction_src_dir)/slp-font-configuration-parser.cpp \ - $(slp_platform_abstraction_src_dir)/font-platform/font-controller-impl.cpp \ - $(slp_platform_abstraction_src_dir)/data-cache/data-cache-io.cpp \ - $(slp_platform_abstraction_src_dir)/data-cache/data-cache-impl.cpp \ - $(slp_platform_abstraction_src_dir)/data-cache/tests/data-cache-debug.cpp \ - $(slp_platform_abstraction_src_dir)/data-cache/data-compression.cpp \ - $(slp_platform_abstraction_src_dir)/data-cache/metrics-cache.cpp \ - $(slp_platform_abstraction_src_dir)/dynamics/dynamics-factory.cpp \ - \ - $(slp_platform_abstraction_src_dir)/resource-loader/loader-font.cpp \ - $(slp_platform_abstraction_src_dir)/resource-loader/resource-loader.cpp \ - $(slp_platform_abstraction_src_dir)/resource-loader/resource-requester-base.cpp \ - $(slp_platform_abstraction_src_dir)/resource-loader/resource-bitmap-requester.cpp \ - $(slp_platform_abstraction_src_dir)/resource-loader/resource-shader-requester.cpp \ - $(slp_platform_abstraction_src_dir)/resource-loader/resource-text-requester.cpp \ - \ - $(slp_platform_abstraction_src_dir)/resource-loader/resource-thread-base.cpp \ - $(slp_platform_abstraction_src_dir)/resource-loader/resource-thread-image.cpp \ - $(slp_platform_abstraction_src_dir)/resource-loader/resource-thread-shader.cpp \ - $(slp_platform_abstraction_src_dir)/resource-loader/resource-thread-text.cpp \ - \ - \ - $(slp_platform_abstraction_src_dir)/resource-loader/debug/resource-loader-debug.cpp \ - \ - $(slp_platform_abstraction_src_dir)/image-loaders/loader-bmp.cpp \ - $(slp_platform_abstraction_src_dir)/image-loaders/loader-gif.cpp \ - $(slp_platform_abstraction_src_dir)/image-loaders/loader-png.cpp \ - $(slp_platform_abstraction_src_dir)/image-loaders/loader-ico.cpp \ - $(slp_platform_abstraction_src_dir)/image-loaders/loader-ktx.cpp \ - $(slp_platform_abstraction_src_dir)/image-loaders/loader-wbmp.cpp \ - $(slp_platform_abstraction_src_dir)/image-loaders/image-loader.cpp \ - $(portable_platform_abstraction_src_dir)/image-operations.cpp - -slp_turbo_jpeg_loader = \ - $(slp_platform_abstraction_src_dir)/image-loaders/loader-jpeg-turbo.cpp - -slp_jpeg_loader = \ - $(slp_platform_abstraction_src_dir)/image-loaders/loader-jpeg.cpp - -# Add public headers here: - -# platform_abstraction_header_files = diff --git a/platform-abstractions/slp/data-cache/data-cache-impl.cpp b/platform-abstractions/tizen/data-cache/data-cache-impl.cpp similarity index 99% rename from platform-abstractions/slp/data-cache/data-cache-impl.cpp rename to platform-abstractions/tizen/data-cache/data-cache-impl.cpp index 296917f..c1d898d 100644 --- a/platform-abstractions/slp/data-cache/data-cache-impl.cpp +++ b/platform-abstractions/tizen/data-cache/data-cache-impl.cpp @@ -31,7 +31,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { namespace @@ -582,7 +582,7 @@ unsigned int DataCache::GetMaxEncodedDataSize() const } } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali @@ -594,5 +594,5 @@ Dali::Platform::DataCache* Dali::Platform::DataCache::New( unsigned int maxDataSize, unsigned int maxNumberEntries) { - return new Dali::SlpPlatform::DataCache( mode, compressionMode, fileName, maxDataSize, maxNumberEntries ); + return new Dali::TizenPlatform::DataCache( mode, compressionMode, fileName, maxDataSize, maxNumberEntries ); } diff --git a/platform-abstractions/slp/data-cache/data-cache-impl.h b/platform-abstractions/tizen/data-cache/data-cache-impl.h similarity index 97% rename from platform-abstractions/slp/data-cache/data-cache-impl.h rename to platform-abstractions/tizen/data-cache/data-cache-impl.h index 35287e7..ad0cfcd 100644 --- a/platform-abstractions/slp/data-cache/data-cache-impl.h +++ b/platform-abstractions/tizen/data-cache/data-cache-impl.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_DATA_CACHE_H__ -#define __DALI_SLP_PLATFORM_DATA_CACHE_H__ +#ifndef __DALI_TIZEN_PLATFORM_DATA_CACHE_H__ +#define __DALI_TIZEN_PLATFORM_DATA_CACHE_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -25,7 +25,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { /** @@ -238,8 +238,8 @@ private: }; -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_DATA_CACHE_H__ +#endif // __DALI_TIZEN_PLATFORM_DATA_CACHE_H__ diff --git a/platform-abstractions/slp/data-cache/data-cache-io.cpp b/platform-abstractions/tizen/data-cache/data-cache-io.cpp similarity index 99% rename from platform-abstractions/slp/data-cache/data-cache-io.cpp rename to platform-abstractions/tizen/data-cache/data-cache-io.cpp index e6f913e..57296ca 100644 --- a/platform-abstractions/slp/data-cache/data-cache-io.cpp +++ b/platform-abstractions/tizen/data-cache/data-cache-io.cpp @@ -32,7 +32,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { namespace DataCacheIo @@ -631,6 +631,6 @@ std::size_t GetHeaderSize() } } // namespace DataCacheIO -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/data-cache/data-cache-io.h b/platform-abstractions/tizen/data-cache/data-cache-io.h similarity index 97% rename from platform-abstractions/slp/data-cache/data-cache-io.h rename to platform-abstractions/tizen/data-cache/data-cache-io.h index 7b3e67d..76a5a9a 100644 --- a/platform-abstractions/slp/data-cache/data-cache-io.h +++ b/platform-abstractions/tizen/data-cache/data-cache-io.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_DATA_CACHE_IO_H__ -#define __DALI_SLP_PLATFORM_DATA_CACHE_IO_H__ +#ifndef __DALI_TIZEN_PLATFORM_DATA_CACHE_IO_H__ +#define __DALI_TIZEN_PLATFORM_DATA_CACHE_IO_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -23,7 +23,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { /** @@ -230,8 +230,8 @@ std::size_t GetHeaderSize(); } // namespace DataCacheIO -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_DATA_CACHE_IO_H__ +#endif // __DALI_TIZEN_PLATFORM_DATA_CACHE_IO_H__ diff --git a/platform-abstractions/slp/data-cache/data-compression.cpp b/platform-abstractions/tizen/data-cache/data-compression.cpp similarity index 98% rename from platform-abstractions/slp/data-cache/data-compression.cpp rename to platform-abstractions/tizen/data-cache/data-compression.cpp index ea4e823..d1076e1 100644 --- a/platform-abstractions/slp/data-cache/data-compression.cpp +++ b/platform-abstractions/tizen/data-cache/data-compression.cpp @@ -21,7 +21,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { namespace DataCompression { @@ -149,6 +149,6 @@ bool DecodeRle( const unsigned char* input, } // DataCompression -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/data-cache/data-compression.h b/platform-abstractions/tizen/data-cache/data-compression.h similarity index 91% rename from platform-abstractions/slp/data-cache/data-compression.h rename to platform-abstractions/tizen/data-cache/data-compression.h index a2d1885..451b250 100644 --- a/platform-abstractions/slp/data-cache/data-compression.h +++ b/platform-abstractions/tizen/data-cache/data-compression.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_DATA_COMPRESSION_H__ -#define __DALI_SLP_PLATFORM_DATA_COMPRESSION_H__ +#ifndef __DALI_TIZEN_PLATFORM_DATA_COMPRESSION_H__ +#define __DALI_TIZEN_PLATFORM_DATA_COMPRESSION_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -21,7 +21,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { namespace DataCompression { @@ -65,8 +65,8 @@ bool DecodeRle( const unsigned char* input, } // namespace DataCompression -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_DATA_COMPRESSION_H__ +#endif // __DALI_TIZEN_PLATFORM_DATA_COMPRESSION_H__ diff --git a/platform-abstractions/slp/data-cache/metrics-cache.cpp b/platform-abstractions/tizen/data-cache/metrics-cache.cpp similarity index 99% rename from platform-abstractions/slp/data-cache/metrics-cache.cpp rename to platform-abstractions/tizen/data-cache/metrics-cache.cpp index 822bb08..edc5a43 100644 --- a/platform-abstractions/slp/data-cache/metrics-cache.cpp +++ b/platform-abstractions/tizen/data-cache/metrics-cache.cpp @@ -171,7 +171,7 @@ void WriteGlyphGlobalMetrics( std::ofstream &file, const Integration::GlobalMetr } // Anonymous namespace -namespace SlpPlatform +namespace TizenPlatform { namespace MetricsCache { @@ -293,5 +293,5 @@ void Write( const std::string& fontFamily, const std::string& fontStyle, const I } // MetricsCache -} // SlpPlatform +} // TizenPlatform } // Dali diff --git a/platform-abstractions/slp/data-cache/metrics-cache.h b/platform-abstractions/tizen/data-cache/metrics-cache.h similarity index 94% rename from platform-abstractions/slp/data-cache/metrics-cache.h rename to platform-abstractions/tizen/data-cache/metrics-cache.h index 01ec2bd..5b552f4 100644 --- a/platform-abstractions/slp/data-cache/metrics-cache.h +++ b/platform-abstractions/tizen/data-cache/metrics-cache.h @@ -1,5 +1,5 @@ -#ifndef DALI_SLP_PLATFORM_METRICS_CACHE_H -#define DALI_SLP_PLATFORM_METRICS_CACHE_H +#ifndef DALI_TIZEN_PLATFORM_METRICS_CACHE_H +#define DALI_TIZEN_PLATFORM_METRICS_CACHE_H /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -23,7 +23,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { namespace MetricsCache { @@ -63,7 +63,7 @@ bool Read( const std::string& fontFamily, const std::string& fontStyle, std::vec void Write( const std::string& fontFamily, const std::string& fontStyle, const Integration::GlyphSet& glyphSet ); } // MetricsCache -} // SlpPlatform +} // TizenPlatform } // Dali #endif //DALI_INTEGRATION_METRICS_CACHE_H diff --git a/platform-abstractions/slp/data-cache/tests/data-cache-debug.cpp b/platform-abstractions/tizen/data-cache/tests/data-cache-debug.cpp similarity index 99% rename from platform-abstractions/slp/data-cache/tests/data-cache-debug.cpp rename to platform-abstractions/tizen/data-cache/tests/data-cache-debug.cpp index 156e3e3..c33f21c 100644 --- a/platform-abstractions/slp/data-cache/tests/data-cache-debug.cpp +++ b/platform-abstractions/tizen/data-cache/tests/data-cache-debug.cpp @@ -32,7 +32,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { namespace DataCacheIo @@ -346,7 +346,7 @@ void ThreadedStressTest() } // namespace DataCacheIO -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali #endif // #ifdef DATA_CACHE_DEBUG diff --git a/platform-abstractions/slp/data-cache/tests/data-cache-debug.h b/platform-abstractions/tizen/data-cache/tests/data-cache-debug.h similarity index 84% rename from platform-abstractions/slp/data-cache/tests/data-cache-debug.h rename to platform-abstractions/tizen/data-cache/tests/data-cache-debug.h index 158ed3a..2387478 100644 --- a/platform-abstractions/slp/data-cache/tests/data-cache-debug.h +++ b/platform-abstractions/tizen/data-cache/tests/data-cache-debug.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_DATA_CACHE_DEBUG_H__ -#define __DALI_SLP_PLATFORM_DATA_CACHE_DEBUG_H__ +#ifndef __DALI_TIZEN_PLATFORM_DATA_CACHE_DEBUG_H__ +#define __DALI_TIZEN_PLATFORM_DATA_CACHE_DEBUG_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -23,7 +23,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { namespace DataCacheIo { @@ -39,9 +39,9 @@ void ThreadedStressTest(); } // namespace DataCacheIO -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_DATA_CACHE_DEBUG_H__ +#endif // __DALI_TIZEN_PLATFORM_DATA_CACHE_DEBUG_H__ #endif // #ifdef DATA_CACHE_DEBUG diff --git a/platform-abstractions/slp/dynamics/dynamics-factory.cpp b/platform-abstractions/tizen/dynamics/dynamics-factory.cpp similarity index 98% rename from platform-abstractions/slp/dynamics/dynamics-factory.cpp rename to platform-abstractions/tizen/dynamics/dynamics-factory.cpp index c2acff0..0058c22 100644 --- a/platform-abstractions/slp/dynamics/dynamics-factory.cpp +++ b/platform-abstractions/tizen/dynamics/dynamics-factory.cpp @@ -32,7 +32,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { namespace @@ -192,6 +192,6 @@ Integration::DynamicsShape* DynamicsFactory::CreateDynamicsShape() return dynamicsShape; } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/dynamics/dynamics-factory.h b/platform-abstractions/tizen/dynamics/dynamics-factory.h similarity index 97% rename from platform-abstractions/slp/dynamics/dynamics-factory.h rename to platform-abstractions/tizen/dynamics/dynamics-factory.h index 039adc5..5c28bc8 100644 --- a/platform-abstractions/slp/dynamics/dynamics-factory.h +++ b/platform-abstractions/tizen/dynamics/dynamics-factory.h @@ -26,7 +26,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { /** @@ -90,7 +90,7 @@ private: }; // class DynamicsFactory -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/tizen/file.list b/platform-abstractions/tizen/file.list new file mode 100755 index 0000000..7691504 --- /dev/null +++ b/platform-abstractions/tizen/file.list @@ -0,0 +1,47 @@ +# Add local source files here: + +tizen_platform_abstraction_src_files = \ + $(tizen_platform_abstraction_src_dir)/tizen-platform-abstraction.cpp \ + $(tizen_platform_abstraction_src_dir)/tizen-logging.cpp \ + $(tizen_platform_abstraction_src_dir)/tizen-font-configuration-parser.cpp \ + $(tizen_platform_abstraction_src_dir)/font-platform/font-controller-impl.cpp \ + $(tizen_platform_abstraction_src_dir)/data-cache/data-cache-io.cpp \ + $(tizen_platform_abstraction_src_dir)/data-cache/data-cache-impl.cpp \ + $(tizen_platform_abstraction_src_dir)/data-cache/tests/data-cache-debug.cpp \ + $(tizen_platform_abstraction_src_dir)/data-cache/data-compression.cpp \ + $(tizen_platform_abstraction_src_dir)/data-cache/metrics-cache.cpp \ + $(tizen_platform_abstraction_src_dir)/dynamics/dynamics-factory.cpp \ + \ + $(tizen_platform_abstraction_src_dir)/resource-loader/loader-font.cpp \ + $(tizen_platform_abstraction_src_dir)/resource-loader/resource-loader.cpp \ + $(tizen_platform_abstraction_src_dir)/resource-loader/resource-requester-base.cpp \ + $(tizen_platform_abstraction_src_dir)/resource-loader/resource-bitmap-requester.cpp \ + $(tizen_platform_abstraction_src_dir)/resource-loader/resource-shader-requester.cpp \ + $(tizen_platform_abstraction_src_dir)/resource-loader/resource-text-requester.cpp \ + \ + $(tizen_platform_abstraction_src_dir)/resource-loader/resource-thread-base.cpp \ + $(tizen_platform_abstraction_src_dir)/resource-loader/resource-thread-image.cpp \ + $(tizen_platform_abstraction_src_dir)/resource-loader/resource-thread-shader.cpp \ + $(tizen_platform_abstraction_src_dir)/resource-loader/resource-thread-text.cpp \ + \ + \ + $(tizen_platform_abstraction_src_dir)/resource-loader/debug/resource-loader-debug.cpp \ + \ + $(tizen_platform_abstraction_src_dir)/image-loaders/loader-bmp.cpp \ + $(tizen_platform_abstraction_src_dir)/image-loaders/loader-gif.cpp \ + $(tizen_platform_abstraction_src_dir)/image-loaders/loader-png.cpp \ + $(tizen_platform_abstraction_src_dir)/image-loaders/loader-ico.cpp \ + $(tizen_platform_abstraction_src_dir)/image-loaders/loader-ktx.cpp \ + $(tizen_platform_abstraction_src_dir)/image-loaders/loader-wbmp.cpp \ + $(tizen_platform_abstraction_src_dir)/image-loaders/image-loader.cpp \ + $(portable_platform_abstraction_src_dir)/image-operations.cpp + +tizen_turbo_jpeg_loader = \ + $(tizen_platform_abstraction_src_dir)/image-loaders/loader-jpeg-turbo.cpp + +tizen_jpeg_loader = \ + $(tizen_platform_abstraction_src_dir)/image-loaders/loader-jpeg.cpp + +# Add public headers here: + +# platform_abstraction_header_files = diff --git a/platform-abstractions/slp/font-platform/font-controller-impl.cpp b/platform-abstractions/tizen/font-platform/font-controller-impl.cpp similarity index 99% rename from platform-abstractions/slp/font-platform/font-controller-impl.cpp rename to platform-abstractions/tizen/font-platform/font-controller-impl.cpp index eacb39a..9f0d6e8 100755 --- a/platform-abstractions/slp/font-platform/font-controller-impl.cpp +++ b/platform-abstractions/tizen/font-platform/font-controller-impl.cpp @@ -29,7 +29,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { #if defined(DEBUG_ENABLED) @@ -780,12 +780,12 @@ void FontController::ClearPreferredFontList() mPreferredFonts.Clear(); } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali // Implementation of Dali::Platform::FontController::New() Dali::Platform::FontController* Dali::Platform::FontController::New() { - return new Dali::SlpPlatform::FontController(); + return new Dali::TizenPlatform::FontController(); } diff --git a/platform-abstractions/slp/font-platform/font-controller-impl.h b/platform-abstractions/tizen/font-platform/font-controller-impl.h similarity index 97% rename from platform-abstractions/slp/font-platform/font-controller-impl.h rename to platform-abstractions/tizen/font-platform/font-controller-impl.h index fd09a20..469d637 100644 --- a/platform-abstractions/slp/font-platform/font-controller-impl.h +++ b/platform-abstractions/tizen/font-platform/font-controller-impl.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_FONT_CONTROLLER_H__ -#define __DALI_SLP_PLATFORM_FONT_CONTROLLER_H__ +#ifndef __DALI_TIZEN_PLATFORM_FONT_CONTROLLER_H__ +#define __DALI_TIZEN_PLATFORM_FONT_CONTROLLER_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -36,13 +36,13 @@ struct _FcFontSet; namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { typedef Dali::Platform::FontController::FontList FontList; /** - * concrete interface for the SLP font controller. + * concrete interface for the TIZEN font controller. * * Font controller currently caches the following: * - List of fonts on the system, if the user calls GetFontList() @@ -248,8 +248,8 @@ private: }; -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_FONT_CONTROLLER_H__ +#endif // __DALI_TIZEN_PLATFORM_FONT_CONTROLLER_H__ diff --git a/platform-abstractions/slp/image-loaders/image-loader.cpp b/platform-abstractions/tizen/image-loaders/image-loader.cpp similarity index 99% rename from platform-abstractions/slp/image-loaders/image-loader.cpp rename to platform-abstractions/tizen/image-loaders/image-loader.cpp index 70a7118..86a548f 100644 --- a/platform-abstractions/slp/image-loaders/image-loader.cpp +++ b/platform-abstractions/tizen/image-loaders/image-loader.cpp @@ -34,7 +34,7 @@ using namespace Dali::Integration; namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { namespace @@ -410,5 +410,5 @@ void GetClosestImageSize( ResourcePointer resourceBuffer, } } // ImageLoader -} // SlpPlatform +} // TizenPlatform } // Dali diff --git a/platform-abstractions/slp/image-loaders/image-loader.h b/platform-abstractions/tizen/image-loaders/image-loader.h similarity index 92% rename from platform-abstractions/slp/image-loaders/image-loader.h rename to platform-abstractions/tizen/image-loaders/image-loader.h index 62db632..ea7b3a5 100644 --- a/platform-abstractions/slp/image-loaders/image-loader.h +++ b/platform-abstractions/tizen/image-loaders/image-loader.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_IMAGE_LOADER_H__ -#define __DALI_SLP_PLATFORM_IMAGE_LOADER_H__ +#ifndef __DALI_TIZEN_PLATFORM_IMAGE_LOADER_H__ +#define __DALI_TIZEN_PLATFORM_IMAGE_LOADER_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -24,7 +24,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { namespace ImageLoader { @@ -60,7 +60,7 @@ void GetClosestImageSize( Integration::ResourcePointer resourceBuffer, Vector2 &closestSize ); } // ImageLoader -} // SlpPlatform +} // TizenPlatform } // Dali -#endif // __DALI_SLP_PLATFORM_IMAGE_LOADER_H__ +#endif // __DALI_TIZEN_PLATFORM_IMAGE_LOADER_H__ diff --git a/platform-abstractions/slp/image-loaders/loader-bmp.cpp b/platform-abstractions/tizen/image-loaders/loader-bmp.cpp similarity index 99% rename from platform-abstractions/slp/image-loaders/loader-bmp.cpp rename to platform-abstractions/tizen/image-loaders/loader-bmp.cpp index 7c3ce41..3c10913 100644 --- a/platform-abstractions/slp/image-loaders/loader-bmp.cpp +++ b/platform-abstractions/tizen/image-loaders/loader-bmp.cpp @@ -28,7 +28,7 @@ namespace Dali { using Integration::Bitmap; using Dali::Integration::PixelBuffer; -namespace SlpPlatform +namespace TizenPlatform { namespace @@ -1359,6 +1359,6 @@ bool LoadBitmapFromBmp( FILE *fp, Bitmap& bitmap, ImageAttributes& attributes, c return true; } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/image-loaders/loader-bmp.h b/platform-abstractions/tizen/image-loaders/loader-bmp.h similarity index 91% rename from platform-abstractions/slp/image-loaders/loader-bmp.h rename to platform-abstractions/tizen/image-loaders/loader-bmp.h index ec41983..7c306c3 100644 --- a/platform-abstractions/slp/image-loaders/loader-bmp.h +++ b/platform-abstractions/tizen/image-loaders/loader-bmp.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_LOADER_BMP_H__ -#define __DALI_SLP_PLATFORM_LOADER_BMP_H__ +#ifndef __DALI_TIZEN_PLATFORM_LOADER_BMP_H__ +#define __DALI_TIZEN_PLATFORM_LOADER_BMP_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -30,7 +30,7 @@ class Bitmap; struct ImageAttributes; -namespace SlpPlatform +namespace TizenPlatform { class ResourceLoadingClient; @@ -61,8 +61,8 @@ bool LoadBitmapFromBmp( FILE *fp, Integration::Bitmap& bitmap, ImageAttributes& */ bool LoadBmpHeader(FILE *fp, const ImageAttributes& attributes, unsigned int &width, unsigned int &height); -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_LOADER_BMP_H__ +#endif // __DALI_TIZEN_PLATFORM_LOADER_BMP_H__ diff --git a/platform-abstractions/slp/image-loaders/loader-gif.cpp b/platform-abstractions/tizen/image-loaders/loader-gif.cpp similarity index 99% rename from platform-abstractions/slp/image-loaders/loader-gif.cpp rename to platform-abstractions/tizen/image-loaders/loader-gif.cpp index be0cc59..6d9ed0e 100644 --- a/platform-abstractions/slp/image-loaders/loader-gif.cpp +++ b/platform-abstractions/tizen/image-loaders/loader-gif.cpp @@ -29,7 +29,7 @@ namespace Dali using Integration::Bitmap; using Dali::Integration::PixelBuffer; -namespace SlpPlatform +namespace TizenPlatform { namespace @@ -317,6 +317,6 @@ bool LoadBitmapFromGif(FILE *fp, Bitmap& bitmap, ImageAttributes& attributes, co return true; } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/image-loaders/loader-gif.h b/platform-abstractions/tizen/image-loaders/loader-gif.h similarity index 91% rename from platform-abstractions/slp/image-loaders/loader-gif.h rename to platform-abstractions/tizen/image-loaders/loader-gif.h index 278ac37..b3a3699 100644 --- a/platform-abstractions/slp/image-loaders/loader-gif.h +++ b/platform-abstractions/tizen/image-loaders/loader-gif.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_LOADER_GIF_H__ -#define __DALI_SLP_PLATFORM_LOADER_GIF_H__ +#ifndef __DALI_TIZEN_PLATFORM_LOADER_GIF_H__ +#define __DALI_TIZEN_PLATFORM_LOADER_GIF_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -30,7 +30,7 @@ namespace Integration struct ImageAttributes; -namespace SlpPlatform +namespace TizenPlatform { class ResourceLoadingClient; @@ -62,8 +62,8 @@ bool LoadBitmapFromGif( FILE *fp, Integration::Bitmap& bitmap, ImageAttributes& */ bool LoadGifHeader(FILE *fp, const ImageAttributes& attributes, unsigned int &width, unsigned int &height ); -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_LOADER_GIF_H__ +#endif // __DALI_TIZEN_PLATFORM_LOADER_GIF_H__ diff --git a/platform-abstractions/slp/image-loaders/loader-ico.cpp b/platform-abstractions/tizen/image-loaders/loader-ico.cpp similarity index 99% rename from platform-abstractions/slp/image-loaders/loader-ico.cpp rename to platform-abstractions/tizen/image-loaders/loader-ico.cpp index 70cbf14..be812cf 100644 --- a/platform-abstractions/slp/image-loaders/loader-ico.cpp +++ b/platform-abstractions/tizen/image-loaders/loader-ico.cpp @@ -64,7 +64,7 @@ namespace Dali using Integration::Bitmap; using Dali::Integration::PixelBuffer; -namespace SlpPlatform +namespace TizenPlatform { namespace diff --git a/platform-abstractions/slp/image-loaders/loader-ico.h b/platform-abstractions/tizen/image-loaders/loader-ico.h similarity index 90% rename from platform-abstractions/slp/image-loaders/loader-ico.h rename to platform-abstractions/tizen/image-loaders/loader-ico.h index 9b7155e..d481baf 100644 --- a/platform-abstractions/slp/image-loaders/loader-ico.h +++ b/platform-abstractions/tizen/image-loaders/loader-ico.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_LOADER_ICO_H__ -#define __DALI_SLP_PLATFORM_LOADER_ICO_H__ +#ifndef __DALI_TIZEN_PLATFORM_LOADER_ICO_H__ +#define __DALI_TIZEN_PLATFORM_LOADER_ICO_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -29,7 +29,7 @@ namespace Integration } struct ImageAttributes; -namespace SlpPlatform +namespace TizenPlatform { class ResourceLoadingClient; diff --git a/platform-abstractions/slp/image-loaders/loader-jpeg-turbo.cpp b/platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp similarity index 99% rename from platform-abstractions/slp/image-loaders/loader-jpeg-turbo.cpp rename to platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp index 8d76329..28e064e 100755 --- a/platform-abstractions/slp/image-loaders/loader-jpeg-turbo.cpp +++ b/platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp @@ -37,7 +37,7 @@ namespace Dali { using Integration::Bitmap; -namespace SlpPlatform +namespace TizenPlatform { namespace @@ -823,6 +823,6 @@ bool LoadJpegHeader(FILE *fp, const ImageAttributes& attributes, unsigned int &w } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/image-loaders/loader-jpeg.cpp b/platform-abstractions/tizen/image-loaders/loader-jpeg.cpp similarity index 99% rename from platform-abstractions/slp/image-loaders/loader-jpeg.cpp rename to platform-abstractions/tizen/image-loaders/loader-jpeg.cpp index 377a2e1..db7e145 100644 --- a/platform-abstractions/slp/image-loaders/loader-jpeg.cpp +++ b/platform-abstractions/tizen/image-loaders/loader-jpeg.cpp @@ -36,7 +36,7 @@ namespace Dali { using Integration::Bitmap; -namespace SlpPlatform +namespace TizenPlatform { namespace @@ -814,7 +814,7 @@ bool JpegRotate90(unsigned char *buffer, int width, int height, int bpp) return true; } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/image-loaders/loader-jpeg.h b/platform-abstractions/tizen/image-loaders/loader-jpeg.h similarity index 93% rename from platform-abstractions/slp/image-loaders/loader-jpeg.h rename to platform-abstractions/tizen/image-loaders/loader-jpeg.h index ec97537..bcaa3cf 100644 --- a/platform-abstractions/slp/image-loaders/loader-jpeg.h +++ b/platform-abstractions/tizen/image-loaders/loader-jpeg.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_LOADER_JPEG_H__ -#define __DALI_SLP_PLATFORM_LOADER_JPEG_H__ +#ifndef __DALI_TIZEN_PLATFORM_LOADER_JPEG_H__ +#define __DALI_TIZEN_PLATFORM_LOADER_JPEG_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -33,7 +33,7 @@ namespace Integration struct ImageAttributes; -namespace SlpPlatform +namespace TizenPlatform { class ResourceLoadingClient; @@ -78,8 +78,8 @@ bool LoadJpegHeader(FILE *fp, const ImageAttributes& attributes, unsigned int &w */ bool EncodeToJpeg(const unsigned char* pixelBuffer, std::vector< unsigned char >& encodedPixels, std::size_t width, std::size_t height, Pixel::Format pixelFormat, unsigned quality = 80); -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_LOADER_JPEG_H__ +#endif // __DALI_TIZEN_PLATFORM_LOADER_JPEG_H__ diff --git a/platform-abstractions/slp/image-loaders/loader-ktx.cpp b/platform-abstractions/tizen/image-loaders/loader-ktx.cpp similarity index 99% rename from platform-abstractions/slp/image-loaders/loader-ktx.cpp rename to platform-abstractions/tizen/image-loaders/loader-ktx.cpp index 04e08d4..eb14c5a 100755 --- a/platform-abstractions/slp/image-loaders/loader-ktx.cpp +++ b/platform-abstractions/tizen/image-loaders/loader-ktx.cpp @@ -33,7 +33,7 @@ namespace Dali using Integration::Bitmap; using Dali::Integration::PixelBuffer; -namespace SlpPlatform +namespace TizenPlatform { namespace @@ -375,6 +375,6 @@ bool LoadBitmapFromKtx( FILE * const fp, Bitmap& bitmap, ImageAttributes& attrib return true; } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/image-loaders/loader-ktx.h b/platform-abstractions/tizen/image-loaders/loader-ktx.h similarity index 91% rename from platform-abstractions/slp/image-loaders/loader-ktx.h rename to platform-abstractions/tizen/image-loaders/loader-ktx.h index 9b18007..5a5e0ae 100644 --- a/platform-abstractions/slp/image-loaders/loader-ktx.h +++ b/platform-abstractions/tizen/image-loaders/loader-ktx.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_LOADER_KTX_H__ -#define __DALI_SLP_PLATFORM_LOADER_KTX_H__ +#ifndef __DALI_TIZEN_PLATFORM_LOADER_KTX_H__ +#define __DALI_TIZEN_PLATFORM_LOADER_KTX_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -30,7 +30,7 @@ namespace Integration struct ImageAttributes; -namespace SlpPlatform +namespace TizenPlatform { class ResourceLoadingClient; @@ -62,8 +62,8 @@ bool LoadBitmapFromKtx( FILE * const fp, Integration::Bitmap& bitmap, ImageAttri */ bool LoadKtxHeader(FILE * const fp, const ImageAttributes& attributes, unsigned int &width, unsigned int &height); -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_LOADER_KTX_H__ +#endif // __DALI_TIZEN_PLATFORM_LOADER_KTX_H__ diff --git a/platform-abstractions/slp/image-loaders/loader-png.cpp b/platform-abstractions/tizen/image-loaders/loader-png.cpp similarity index 99% rename from platform-abstractions/slp/image-loaders/loader-png.cpp rename to platform-abstractions/tizen/image-loaders/loader-png.cpp index 95a9f40..209834c 100644 --- a/platform-abstractions/slp/image-loaders/loader-png.cpp +++ b/platform-abstractions/tizen/image-loaders/loader-png.cpp @@ -37,7 +37,7 @@ namespace Dali using Integration::Bitmap; using Dali::Integration::PixelBuffer; -namespace SlpPlatform +namespace TizenPlatform { namespace @@ -351,7 +351,7 @@ namespace * */ extern "C" void WriteData(png_structp png_ptr, png_bytep data, png_size_t length) { - using Dali::SlpPlatform::PngBuffer; + using Dali::TizenPlatform::PngBuffer; DALI_ASSERT_DEBUG(png_ptr && data); if(!png_ptr || !data) { @@ -511,6 +511,6 @@ bool EncodeToPng( const unsigned char* const pixelBuffer, PngBuffer& encodedPixe return true; } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/image-loaders/loader-png.h b/platform-abstractions/tizen/image-loaders/loader-png.h similarity index 93% rename from platform-abstractions/slp/image-loaders/loader-png.h rename to platform-abstractions/tizen/image-loaders/loader-png.h index 698d6ad..f1dedb3 100644 --- a/platform-abstractions/slp/image-loaders/loader-png.h +++ b/platform-abstractions/tizen/image-loaders/loader-png.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_LOADER_PNG_H__ -#define __DALI_SLP_PLATFORM_LOADER_PNG_H__ +#ifndef __DALI_TIZEN_PLATFORM_LOADER_PNG_H__ +#define __DALI_TIZEN_PLATFORM_LOADER_PNG_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -32,7 +32,7 @@ namespace Integration } struct ImageAttributes; -namespace SlpPlatform +namespace TizenPlatform { class ResourceLoadingClient; @@ -78,8 +78,8 @@ typedef std::vector PngBuffer; */ bool EncodeToPng( const unsigned char* pixelBuffer, PngBuffer& encodedPixels, std::size_t width, std::size_t height, Pixel::Format pixelFormat ); -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_LOADER_PNG_H__ +#endif // __DALI_TIZEN_PLATFORM_LOADER_PNG_H__ diff --git a/platform-abstractions/slp/image-loaders/loader-wbmp.cpp b/platform-abstractions/tizen/image-loaders/loader-wbmp.cpp similarity index 99% rename from platform-abstractions/slp/image-loaders/loader-wbmp.cpp rename to platform-abstractions/tizen/image-loaders/loader-wbmp.cpp index e7d49a2..5ca55b7 100755 --- a/platform-abstractions/slp/image-loaders/loader-wbmp.cpp +++ b/platform-abstractions/tizen/image-loaders/loader-wbmp.cpp @@ -33,7 +33,7 @@ namespace Dali { using Integration::Bitmap; using Dali::Integration::PixelBuffer; -namespace SlpPlatform +namespace TizenPlatform { namespace diff --git a/platform-abstractions/slp/image-loaders/loader-wbmp.h b/platform-abstractions/tizen/image-loaders/loader-wbmp.h similarity index 89% rename from platform-abstractions/slp/image-loaders/loader-wbmp.h rename to platform-abstractions/tizen/image-loaders/loader-wbmp.h index dfc64cf..21d8081 100755 --- a/platform-abstractions/slp/image-loaders/loader-wbmp.h +++ b/platform-abstractions/tizen/image-loaders/loader-wbmp.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_LOADER_WBMP_H__ -#define __DALI_SLP_PLATFORM_LOADER_WBMP_H__ +#ifndef __DALI_TIZEN_PLATFORM_LOADER_WBMP_H__ +#define __DALI_TIZEN_PLATFORM_LOADER_WBMP_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -29,7 +29,7 @@ namespace Integration } struct ImageAttributes; -namespace SlpPlatform +namespace TizenPlatform { class ResourceLoadingClient; diff --git a/platform-abstractions/slp/resource-loader/debug/resource-loader-debug.cpp b/platform-abstractions/tizen/resource-loader/debug/resource-loader-debug.cpp similarity index 98% rename from platform-abstractions/slp/resource-loader/debug/resource-loader-debug.cpp rename to platform-abstractions/tizen/resource-loader/debug/resource-loader-debug.cpp index 62dd906..6c3b3f3 100644 --- a/platform-abstractions/slp/resource-loader/debug/resource-loader-debug.cpp +++ b/platform-abstractions/tizen/resource-loader/debug/resource-loader-debug.cpp @@ -26,7 +26,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { using namespace Dali::Integration; @@ -68,7 +68,7 @@ std::string DebugResourceList(LoadedResource& partialResource) return textString; } -} //SlpPlatform +} //TizenPlatform } //Dali #endif diff --git a/platform-abstractions/slp/resource-loader/debug/resource-loader-debug.h b/platform-abstractions/tizen/resource-loader/debug/resource-loader-debug.h similarity index 77% rename from platform-abstractions/slp/resource-loader/debug/resource-loader-debug.h rename to platform-abstractions/tizen/resource-loader/debug/resource-loader-debug.h index 87a54c2..7fc2578 100644 --- a/platform-abstractions/slp/resource-loader/debug/resource-loader-debug.h +++ b/platform-abstractions/tizen/resource-loader/debug/resource-loader-debug.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_RESOURCE_LOADER_DEBUG_H__ -#define __DALI_SLP_PLATFORM_RESOURCE_LOADER_DEBUG_H__ +#ifndef __DALI_TIZEN_PLATFORM_RESOURCE_LOADER_DEBUG_H__ +#define __DALI_TIZEN_PLATFORM_RESOURCE_LOADER_DEBUG_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -21,13 +21,13 @@ #include #if defined(DEBUG_ENABLED) -#include +#include #include namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { extern Debug::Filter* gLoaderFilter; @@ -35,8 +35,8 @@ extern Debug::Filter* gLoaderFilter; std::string DebugRequestList(Integration::TextResourceType::CharacterList& chars); std::string DebugResourceList(LoadedResource& partialResource); -} // SlpPlatform +} // TizenPlatform } // Dali #endif // defined(DEBUG_ENABLED) -#endif //__DALI_SLP_PLATFORM_RESOURCE_LOADER_DEBUG_H__ +#endif //__DALI_TIZEN_PLATFORM_RESOURCE_LOADER_DEBUG_H__ diff --git a/platform-abstractions/slp/resource-loader/image-encoder.h b/platform-abstractions/tizen/resource-loader/image-encoder.h similarity index 84% rename from platform-abstractions/slp/resource-loader/image-encoder.h rename to platform-abstractions/tizen/resource-loader/image-encoder.h index ca2aa91..e6ec381 100644 --- a/platform-abstractions/slp/resource-loader/image-encoder.h +++ b/platform-abstractions/tizen/resource-loader/image-encoder.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_IMAGE_ENCODER_H__ -#define __DALI_SLP_PLATFORM_IMAGE_ENCODER_H__ +#ifndef __DALI_TIZEN_PLATFORM_IMAGE_ENCODER_H__ +#define __DALI_TIZEN_PLATFORM_IMAGE_ENCODER_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -36,4 +36,4 @@ enum FileFormat } // namespace Dali -#endif //__DALI_SLP_PLATFORM_IMAGE_ENCODER_H__ +#endif //__DALI_TIZEN_PLATFORM_IMAGE_ENCODER_H__ diff --git a/platform-abstractions/slp/resource-loader/loader-font.cpp b/platform-abstractions/tizen/resource-loader/loader-font.cpp similarity index 92% rename from platform-abstractions/slp/resource-loader/loader-font.cpp rename to platform-abstractions/tizen/resource-loader/loader-font.cpp index 3a06871..3014138 100644 --- a/platform-abstractions/slp/resource-loader/loader-font.cpp +++ b/platform-abstractions/tizen/resource-loader/loader-font.cpp @@ -22,7 +22,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { using namespace Dali::Integration; @@ -33,9 +33,9 @@ static Integration::Log::Filter* gLogFilter = Log::Filter::New(Log::General, fal } // unnamed namespace #endif -static SlpFace* LoadFontFile(const std::string &fileName, FT_Library freeType) +static TizenFace* LoadFontFile(const std::string &fileName, FT_Library freeType) { - SlpFace* slpFace = NULL; + TizenFace* tizenFace = NULL; // Open freetype font file FILE* fontFile = fopen(fileName.c_str(), "rb"); @@ -64,23 +64,23 @@ static SlpFace* LoadFontFile(const std::string &fileName, FT_Library freeType) } // allocate a buffer for the file (throws a memory exception on failure) - slpFace = new SlpFace; - slpFace->buffer = new FT_Byte[fileSize]; + tizenFace = new TizenFace; + tizenFace->buffer = new FT_Byte[fileSize]; // read the file - unsigned int bytes = fread(slpFace->buffer, 1, fileSize, fontFile); + unsigned int bytes = fread(tizenFace->buffer, 1, fileSize, fontFile); if (bytes != fileSize) { DALI_LOG_WARNING("Number of bytes read (%d) does not match the file's size (%d)\n", bytes, fileSize); } // create a freetype face from the memory buffer - FT_Error retVal = FT_New_Memory_Face(freeType, slpFace->buffer, fileSize, 0, &slpFace->face); + FT_Error retVal = FT_New_Memory_Face(freeType, tizenFace->buffer, fileSize, 0, &tizenFace->face); if (retVal != FT_Err_Ok) { DALI_LOG_WARNING("FT_New_Face failed on %s\n", fileName.c_str()); - delete slpFace; - slpFace = NULL; + delete tizenFace; + tizenFace = NULL; } } @@ -88,27 +88,27 @@ static SlpFace* LoadFontFile(const std::string &fileName, FT_Library freeType) fclose(fontFile); } - return slpFace; + return tizenFace; } -SlpFace* LoadFontFace(const std::string &fileName, +TizenFace* LoadFontFace(const std::string &fileName, const PointSize pointSize, const unsigned int dpiHor, const unsigned int dpiVer, FT_Library freeType) { - SlpFace* slpFace = LoadFontFile(fileName, freeType); + TizenFace* tizenFace = LoadFontFile(fileName, freeType); - if (NULL != slpFace) + if (NULL != tizenFace) { - FT_Face face = slpFace->face; + FT_Face face = tizenFace->face; // set the char size for glyph scaling FT_Error retVal = FT_Set_Char_Size(face, 0, static_cast(roundf(pointSize.value))<<6, dpiHor, dpiVer); if (retVal != FT_Err_Ok) { DALI_LOG_WARNING("FT_Set_Char_Size failed on %s\n", fileName.c_str()); - delete slpFace; - slpFace = NULL; + delete tizenFace; + tizenFace = NULL; } else { @@ -121,27 +121,27 @@ SlpFace* LoadFontFace(const std::string &fileName, } } - return slpFace; + return tizenFace; } -SlpFace* LoadFontFace(const std::string &fileName, +TizenFace* LoadFontFace(const std::string &fileName, const PixelSize pixelSize, FT_Library freeType) { - SlpFace* slpFace = LoadFontFile(fileName, freeType); + TizenFace* tizenFace = LoadFontFile(fileName, freeType); - if (NULL != slpFace) + if (NULL != tizenFace) { - FT_Face face = slpFace->face; + FT_Face face = tizenFace->face; // set the pixel size for glyph scaling FT_Error retVal = FT_Set_Pixel_Sizes(face, pixelSize, pixelSize); if (retVal != FT_Err_Ok) { DALI_LOG_WARNING("FT_Set_Pixel_Sizes failed on %s\n", fileName.c_str()); - delete slpFace; - slpFace = NULL; + delete tizenFace; + tizenFace = NULL; } else { @@ -154,7 +154,7 @@ SlpFace* LoadFontFace(const std::string &fileName, } } - return slpFace; + return tizenFace; } // charcode must be UTF-32 representation @@ -358,6 +358,6 @@ Integration::BitmapPtr GetGlyphBitmap( FT_Face face, FT_ULong charCode ) return image; } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/resource-loader/loader-font.h b/platform-abstractions/tizen/resource-loader/loader-font.h similarity index 88% rename from platform-abstractions/slp/resource-loader/loader-font.h rename to platform-abstractions/tizen/resource-loader/loader-font.h index e18f3f3..71aec46 100644 --- a/platform-abstractions/slp/resource-loader/loader-font.h +++ b/platform-abstractions/tizen/resource-loader/loader-font.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_LOADER_FONT_H__ -#define __DALI_SLP_PLATFORM_LOADER_FONT_H__ +#ifndef __DALI_TIZEN_PLATFORM_LOADER_FONT_H__ +#define __DALI_TIZEN_PLATFORM_LOADER_FONT_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -34,17 +34,17 @@ namespace Integration class GlyphSet; } -namespace SlpPlatform +namespace TizenPlatform { -struct SlpFace +struct TizenFace { - SlpFace() + TizenFace() { face = NULL; buffer = NULL; } - ~SlpFace() + ~TizenFace() { if (face) { @@ -69,9 +69,9 @@ struct SlpFace * @param [in] dpiHor Horizontal dpi * @param [in] dpiVer Vertical dpi * @param [inout] freeType A handle to the FreeType library resource - * @return A SlpFace pointer on success, NULL on failure + * @return A TizenFace pointer on success, NULL on failure */ -SlpFace* LoadFontFace(const std::string &fileName, +TizenFace* LoadFontFace(const std::string &fileName, const PointSize pointSize, const unsigned int dpiHor, const unsigned int dpiVer, FT_Library freeType); @@ -80,9 +80,9 @@ SlpFace* LoadFontFace(const std::string &fileName, * @param [in] fileName Font file name * @param [in] pixelSize Pixel size for freetype source glyph scaling * @param [inout] freeType A handle to the FreeType library resource - * @return A SlpFace pointer on success, NULL on failure + * @return A TizenFace pointer on success, NULL on failure */ -SlpFace* LoadFontFace(const std::string &fileName, +TizenFace* LoadFontFace(const std::string &fileName, const PixelSize pixelSize, FT_Library freeType); @@ -120,8 +120,8 @@ Integration::GlyphSet::Character* GetCharacter(FT_Face face, const FT_ULong char */ Integration::BitmapPtr GetGlyphBitmap( FT_Face face, FT_ULong charCode ); -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_LOADER_FONT_H__ +#endif // __DALI_TIZEN_PLATFORM_LOADER_FONT_H__ diff --git a/platform-abstractions/slp/resource-loader/platform-capabilities.h b/platform-abstractions/tizen/resource-loader/platform-capabilities.h similarity index 88% rename from platform-abstractions/slp/resource-loader/platform-capabilities.h rename to platform-abstractions/tizen/resource-loader/platform-capabilities.h index 4803927..aba3dbd 100644 --- a/platform-abstractions/slp/resource-loader/platform-capabilities.h +++ b/platform-abstractions/tizen/resource-loader/platform-capabilities.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_CAPABILITIES_H__ -#define __DALI_SLP_PLATFORM_CAPABILITIES_H__ +#ifndef __DALI_TIZEN_PLATFORM_CAPABILITIES_H__ +#define __DALI_TIZEN_PLATFORM_CAPABILITIES_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -23,7 +23,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { /** @@ -52,8 +52,8 @@ inline unsigned int GetTextureDimension( unsigned int size ) #endif } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_CAPABILITIES_H__ +#endif // __DALI_TIZEN_PLATFORM_CAPABILITIES_H__ diff --git a/platform-abstractions/slp/resource-loader/resource-bitmap-requester.cpp b/platform-abstractions/tizen/resource-loader/resource-bitmap-requester.cpp similarity index 98% rename from platform-abstractions/slp/resource-loader/resource-bitmap-requester.cpp rename to platform-abstractions/tizen/resource-loader/resource-bitmap-requester.cpp index 6796311..6a3217e 100644 --- a/platform-abstractions/slp/resource-loader/resource-bitmap-requester.cpp +++ b/platform-abstractions/tizen/resource-loader/resource-bitmap-requester.cpp @@ -22,7 +22,7 @@ using namespace Dali::Integration; namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { ResourceBitmapRequester::ResourceBitmapRequester( ResourceLoader& resourceLoader ) @@ -105,5 +105,5 @@ void ResourceBitmapRequester::CancelLoad(Integration::ResourceId id, Integration mThreadImageRemote->CancelRequest(id); } -} // SlpPlatform +} // TizenPlatform } // Dali diff --git a/platform-abstractions/slp/resource-loader/resource-bitmap-requester.h b/platform-abstractions/tizen/resource-loader/resource-bitmap-requester.h similarity index 90% rename from platform-abstractions/slp/resource-loader/resource-bitmap-requester.h rename to platform-abstractions/tizen/resource-loader/resource-bitmap-requester.h index 516425d..d5a4bb7 100644 --- a/platform-abstractions/slp/resource-loader/resource-bitmap-requester.h +++ b/platform-abstractions/tizen/resource-loader/resource-bitmap-requester.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_RESOURCE_BITMAP_REQUESTER_H__ -#define __DALI_SLP_PLATFORM_RESOURCE_BITMAP_REQUESTER_H__ +#ifndef __DALI_TIZEN_PLATFORM_RESOURCE_BITMAP_REQUESTER_H__ +#define __DALI_TIZEN_PLATFORM_RESOURCE_BITMAP_REQUESTER_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -23,7 +23,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { /** @@ -78,7 +78,7 @@ protected: ResourceThreadImage* mThreadImageRemote; ///< Image loader thread object to download images in remote http server }; -} // SlpPlatform +} // TizenPlatform } // Dali -#endif // __DALI_SLP_PLATFORM_RESOURCE_BITMAP_REQUESTER_H__ +#endif // __DALI_TIZEN_PLATFORM_RESOURCE_BITMAP_REQUESTER_H__ diff --git a/platform-abstractions/slp/resource-loader/resource-loader.cpp b/platform-abstractions/tizen/resource-loader/resource-loader.cpp similarity index 95% rename from platform-abstractions/slp/resource-loader/resource-loader.cpp rename to platform-abstractions/tizen/resource-loader/resource-loader.cpp index 14d7664..4603446 100755 --- a/platform-abstractions/slp/resource-loader/resource-loader.cpp +++ b/platform-abstractions/tizen/resource-loader/resource-loader.cpp @@ -59,7 +59,7 @@ using boost::unique_lock; namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { namespace @@ -494,16 +494,16 @@ PixelSize ResourceLoader::GetFontLineHeightFromCapsHeight( const std::string& fo if (!fontFamily.empty()) { const std::string& fontFileName = GetFontPath( fontFamily, fontStyle ); - SlpFace* slpFace = LoadFontFace(fontFileName, PixelSize(capsHeight), freeType); + TizenFace* tizenFace = LoadFontFace(fontFileName, PixelSize(capsHeight), freeType); - if (slpFace) + if (tizenFace) { - const float scale = static_cast(capsHeight.value) / ((slpFace->face->ascender / 64.0f) * 0.95f); + const float scale = static_cast(capsHeight.value) / ((tizenFace->face->ascender / 64.0f) * 0.95f); - result.value = static_cast(roundf(scale * (slpFace->face->height / 64.0f))); + result.value = static_cast(roundf(scale * (tizenFace->face->height / 64.0f))); - delete slpFace; - slpFace = NULL; + delete tizenFace; + tizenFace = NULL; } } @@ -577,8 +577,8 @@ GlyphSet* ResourceLoader::GetGlyphData (const TextResourceType& textRequest, const bool highQuality(textRequest.mQuality == TextResourceType::TextQualityHigh); const unsigned int glyphQuality( highQuality ? GlyphMetrics::HIGH_QUALITY : GlyphMetrics::LOW_QUALITY ); - SlpFace* slpFace = LoadFontFace( fontFileName, PixelSize( HIGH_QUALITY_PIXEL_SIZE), freeType ); - if (slpFace) + TizenFace* tizenFace = LoadFontFace( fontFileName, PixelSize( HIGH_QUALITY_PIXEL_SIZE), freeType ); + if (tizenFace) { glyphSet = new GlyphSet(); glyphSet->mFontHash = fontHash; @@ -598,7 +598,7 @@ GlyphSet* ResourceLoader::GetGlyphData (const TextResourceType& textRequest, then = GetTimeMicroseconds(); } #endif - ScopedPointer< GlyphSet::Character > character( GetCharacter(slpFace->face, charCode, + ScopedPointer< GlyphSet::Character > character( GetCharacter(tizenFace->face, charCode, DISTANCE_FIELD_SIZE, DISTANCE_FIELD_PADDING, textRequest.mMaxGlyphSize, getBitmap, highQuality ) ); @@ -624,7 +624,7 @@ GlyphSet* ResourceLoader::GetGlyphData (const TextResourceType& textRequest, } } - delete slpFace; + delete tizenFace; } } @@ -705,16 +705,16 @@ void ResourceLoader::GetGlobalMetrics( FT_Library freeType, { const std::string& fontFileName = GetFontPath( fontFamily, fontStyle ); - SlpFace* slpFace = LoadFontFace( fontFileName, PixelSize( HIGH_QUALITY_PIXEL_SIZE), freeType ); - if( slpFace ) + TizenFace* tizenFace = LoadFontFace( fontFileName, PixelSize( HIGH_QUALITY_PIXEL_SIZE), freeType ); + if( tizenFace ) { // scale factor for unit scaled glyphs - const float xScale = 1.0f / (slpFace->face->size->metrics.x_scale / 65536.0f); - const float yScale = 1.0f / (slpFace->face->size->metrics.y_scale / 65536.0f); + const float xScale = 1.0f / (tizenFace->face->size->metrics.x_scale / 65536.0f); + const float yScale = 1.0f / (tizenFace->face->size->metrics.y_scale / 65536.0f); - globalMetrics.lineHeight = slpFace->face->height * ONE_OVER_64; - globalMetrics.ascender = slpFace->face->ascender * ONE_OVER_64; - globalMetrics.unitsPerEM = slpFace->face->units_per_EM * ONE_OVER_64; + globalMetrics.lineHeight = tizenFace->face->height * ONE_OVER_64; + globalMetrics.ascender = tizenFace->face->ascender * ONE_OVER_64; + globalMetrics.unitsPerEM = tizenFace->face->units_per_EM * ONE_OVER_64; globalMetrics.underlinePosition = -4.f; globalMetrics.underlineThickness = 5.f * yScale; @@ -727,7 +727,7 @@ void ResourceLoader::GetGlobalMetrics( FT_Library freeType, globalMetrics.padAdjustX = DISTANCE_FIELD_PADDING * xScale; globalMetrics.padAdjustY = DISTANCE_FIELD_PADDING * yScale; - delete slpFace; + delete tizenFace; } } } @@ -852,12 +852,12 @@ Integration::BitmapPtr ResourceLoader::GetGlyphImage( FT_Library freeType, const Integration::BitmapPtr image; const std::string& fontFileName = GetFontPath( fontFamily, fontStyle ); - SlpFace* slpFace = LoadFontFace( fontFileName, PixelSize( Font::PointsToPixels( fontSize ) ), freeType ); + TizenFace* tizenFace = LoadFontFace( fontFileName, PixelSize( Font::PointsToPixels( fontSize ) ), freeType ); - if( NULL != slpFace ) + if( NULL != tizenFace ) { - image = GetGlyphBitmap( slpFace->face, character ); - delete slpFace; + image = GetGlyphBitmap( tizenFace->face, character ); + delete tizenFace; } return image; @@ -874,6 +874,6 @@ const std::string& ResourceLoader::GetFontPath(const std::string& fontFamily, co return mImpl->mFontController->GetFontPath(std::make_pair(fontFamily,fontStyle)); } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/resource-loader/resource-loader.h b/platform-abstractions/tizen/resource-loader/resource-loader.h similarity index 95% rename from platform-abstractions/slp/resource-loader/resource-loader.h rename to platform-abstractions/tizen/resource-loader/resource-loader.h index dccb366..69da023 100644 --- a/platform-abstractions/slp/resource-loader/resource-loader.h +++ b/platform-abstractions/tizen/resource-loader/resource-loader.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_RESOURCE_LOADER_H__ -#define __DALI_SLP_PLATFORM_RESOURCE_LOADER_H__ +#ifndef __DALI_TIZEN_PLATFORM_RESOURCE_LOADER_H__ +#define __DALI_TIZEN_PLATFORM_RESOURCE_LOADER_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -44,7 +44,7 @@ namespace Platform class FontController; } -namespace SlpPlatform +namespace TizenPlatform { /** @@ -321,27 +321,27 @@ public: std::string& closestFontStyleMatch ); /** - * @copydoc SlpPlatformAbstraction::GetFontLineHeightFromCapsHeight + * @copydoc TizenPlatformAbstraction::GetFontLineHeightFromCapsHeight */ PixelSize GetFontLineHeightFromCapsHeight(const std::string& fontFamily, const std::string& fontStyle, CapsHeight capsHeight, FT_Library freeType); /** - * @copydoc SlpPlatformAbstraction::GetFontList + * @copydoc TizenPlatformAbstraction::GetFontList */ void GetFontList( Dali::Integration::PlatformAbstraction::FontListMode mode, std::vector& fontList ); /** - * @copydoc SlpPlatformAbstraction::LoadFile() + * @copydoc TizenPlatformAbstraction::LoadFile() */ bool LoadFile( const std::string& filename, std::vector< unsigned char >& buffer ) const; /** - * @copydoc SlpPlatformAbstraction::LoadFile() + * @copydoc TizenPlatformAbstraction::LoadFile() */ std::string LoadFile(const std::string& filename) const; /** - * @copydoc SlpPlatformAbstraction::SaveFile() + * @copydoc TizenPlatformAbstraction::SaveFile() */ static bool SaveFile(const std::string& filename, std::vector< unsigned char >& buffer); @@ -386,8 +386,8 @@ private: }; -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLPPLATFORM_RESOURCE_LOADER_H_ +#endif // __DALI_TIZEN_PLATFORM_RESOURCE_LOADER_H_ diff --git a/platform-abstractions/slp/resource-loader/resource-loading-client.h b/platform-abstractions/tizen/resource-loader/resource-loading-client.h similarity index 97% rename from platform-abstractions/slp/resource-loader/resource-loading-client.h rename to platform-abstractions/tizen/resource-loader/resource-loading-client.h index b287281..27c07f0 100644 --- a/platform-abstractions/slp/resource-loader/resource-loading-client.h +++ b/platform-abstractions/tizen/resource-loader/resource-loading-client.h @@ -23,7 +23,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { /** @@ -78,7 +78,7 @@ private: StubbedResourceLoadingClient& operator =( StubbedResourceLoadingClient& rhs ); }; -} /* namespace SlpPlatform */ +} /* namespace TizenPlatform */ } /* namespace Dali */ #endif /* _DALI_PLATFORM_RESOURCE_LOADING_CLIENT_H_ */ diff --git a/platform-abstractions/slp/resource-loader/resource-requester-base.cpp b/platform-abstractions/tizen/resource-loader/resource-requester-base.cpp similarity index 94% rename from platform-abstractions/slp/resource-loader/resource-requester-base.cpp rename to platform-abstractions/tizen/resource-loader/resource-requester-base.cpp index 9f5464d..8714d76 100644 --- a/platform-abstractions/slp/resource-loader/resource-requester-base.cpp +++ b/platform-abstractions/tizen/resource-loader/resource-requester-base.cpp @@ -19,7 +19,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { ResourceRequesterBase::ResourceRequesterBase( ResourceLoader& resourceLoader ) @@ -31,5 +31,5 @@ ResourceRequesterBase::~ResourceRequesterBase() { } -} // Namespace SlpPlatform +} // Namespace TizenPlatform } // Namespace Dali diff --git a/platform-abstractions/slp/resource-loader/resource-requester-base.h b/platform-abstractions/tizen/resource-loader/resource-requester-base.h similarity index 90% rename from platform-abstractions/slp/resource-loader/resource-requester-base.h rename to platform-abstractions/tizen/resource-loader/resource-requester-base.h index c7ff450..a9a54ae 100644 --- a/platform-abstractions/slp/resource-loader/resource-requester-base.h +++ b/platform-abstractions/tizen/resource-loader/resource-requester-base.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_RESOURCE_REQUESTER_BASE_H__ -#define __DALI_SLP_PLATFORM_RESOURCE_REQUESTER_BASE_H__ +#ifndef __DALI_TIZEN_PLATFORM_RESOURCE_REQUESTER_BASE_H__ +#define __DALI_TIZEN_PLATFORM_RESOURCE_REQUESTER_BASE_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -18,7 +18,7 @@ * */ -#include +#include #include #include @@ -29,7 +29,7 @@ namespace Integration class ResourceRequest; } -namespace SlpPlatform +namespace TizenPlatform { /** @@ -106,7 +106,7 @@ private: ResourceRequesterBase& operator=(const ResourceRequesterBase& rhs ); }; -} // SlpPlatform +} // TizenPlatform } // Dali -#endif // __DALI_SLP_PLATFORM_RESOURCE_REQUESTER_BASE_H__ +#endif // __DALI_TIZEN_PLATFORM_RESOURCE_REQUESTER_BASE_H__ diff --git a/platform-abstractions/slp/resource-loader/resource-shader-requester.cpp b/platform-abstractions/tizen/resource-loader/resource-shader-requester.cpp similarity index 97% rename from platform-abstractions/slp/resource-loader/resource-shader-requester.cpp rename to platform-abstractions/tizen/resource-loader/resource-shader-requester.cpp index 45d97ac..e074625 100644 --- a/platform-abstractions/slp/resource-loader/resource-shader-requester.cpp +++ b/platform-abstractions/tizen/resource-loader/resource-shader-requester.cpp @@ -21,7 +21,7 @@ using namespace Dali::Integration; namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { ResourceShaderRequester::ResourceShaderRequester( ResourceLoader& resourceLoader ) @@ -71,5 +71,5 @@ void ResourceShaderRequester::CancelLoad(Integration::ResourceId id, Integration mThreadShader->CancelRequest(id); } -} // SlpPlatform +} // TizenPlatform } // Dali diff --git a/platform-abstractions/slp/resource-loader/resource-shader-requester.h b/platform-abstractions/tizen/resource-loader/resource-shader-requester.h similarity index 90% rename from platform-abstractions/slp/resource-loader/resource-shader-requester.h rename to platform-abstractions/tizen/resource-loader/resource-shader-requester.h index a815eab..b78a0df 100644 --- a/platform-abstractions/slp/resource-loader/resource-shader-requester.h +++ b/platform-abstractions/tizen/resource-loader/resource-shader-requester.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_RESOURCE_SHADER_REQUESTER_H__ -#define __DALI_SLP_PLATFORM_RESOURCE_SHADER_REQUESTER_H__ +#ifndef __DALI_TIZEN_PLATFORM_RESOURCE_SHADER_REQUESTER_H__ +#define __DALI_TIZEN_PLATFORM_RESOURCE_SHADER_REQUESTER_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -23,7 +23,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { /** @@ -82,7 +82,7 @@ protected: ResourceThreadShader* mThreadShader; ///< Thread to load requests }; -} // SlpPlatform +} // TizenPlatform } // Dali -#endif // __DALI_SLP_PLATFORM_RESOURCE_SHADER_REQUESTER_H__ +#endif // __DALI_TIZEN_PLATFORM_RESOURCE_SHADER_REQUESTER_H__ diff --git a/platform-abstractions/slp/resource-loader/resource-text-requester.cpp b/platform-abstractions/tizen/resource-loader/resource-text-requester.cpp similarity index 98% rename from platform-abstractions/slp/resource-loader/resource-text-requester.cpp rename to platform-abstractions/tizen/resource-loader/resource-text-requester.cpp index d00fd7d..b52862d 100644 --- a/platform-abstractions/slp/resource-loader/resource-text-requester.cpp +++ b/platform-abstractions/tizen/resource-loader/resource-text-requester.cpp @@ -24,7 +24,7 @@ using namespace Dali::Integration; namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { namespace @@ -136,6 +136,6 @@ void ResourceTextRequester::CreateThread() } } -} // SlpPlatform +} // TizenPlatform } // Dali diff --git a/platform-abstractions/slp/resource-loader/resource-text-requester.h b/platform-abstractions/tizen/resource-loader/resource-text-requester.h similarity index 87% rename from platform-abstractions/slp/resource-loader/resource-text-requester.h rename to platform-abstractions/tizen/resource-loader/resource-text-requester.h index cfd881b..7e0d3b3 100644 --- a/platform-abstractions/slp/resource-loader/resource-text-requester.h +++ b/platform-abstractions/tizen/resource-loader/resource-text-requester.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_RESOURCE_TEXT_REQUESTER_H__ -#define __DALI_SLP_PLATFORM_RESOURCE_TEXT_REQUESTER_H__ +#ifndef __DALI_TIZEN_PLATFORM_RESOURCE_TEXT_REQUESTER_H__ +#define __DALI_TIZEN_PLATFORM_RESOURCE_TEXT_REQUESTER_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -18,7 +18,7 @@ * */ -#include +#include #include "resource-thread-text.h" namespace Dali @@ -28,7 +28,7 @@ namespace Integration class ResourceRequest; } -namespace SlpPlatform +namespace TizenPlatform { class ResourceTextRequester : public ResourceRequesterBase @@ -91,7 +91,7 @@ protected: ResourceThreadText* mThreadText; ///< Loader thread }; -} // SlpPlatform +} // TizenPlatform } // Dali -#endif // __DALI_SLP_PLATFORM_RESOURCE_TEXT_REQUESTER_H__ +#endif // __DALI_TIZEN_PLATFORM_RESOURCE_TEXT_REQUESTER_H__ diff --git a/platform-abstractions/slp/resource-loader/resource-thread-base.cpp b/platform-abstractions/tizen/resource-loader/resource-thread-base.cpp similarity index 97% rename from platform-abstractions/slp/resource-loader/resource-thread-base.cpp rename to platform-abstractions/tizen/resource-loader/resource-thread-base.cpp index 7a8e4e4..e3f101f 100644 --- a/platform-abstractions/slp/resource-loader/resource-thread-base.cpp +++ b/platform-abstractions/tizen/resource-loader/resource-thread-base.cpp @@ -17,7 +17,7 @@ #include #include "resource-thread-base.h" -#include "slp-logging.h" +#include "tizen-logging.h" #include "atomics.h" using namespace Dali::Integration; @@ -33,7 +33,7 @@ namespace Dali const Integration::ResourceId NO_REQUEST_IN_FLIGHT = Integration::ResourceId(0) - 1; const Integration::ResourceId NO_REQUEST_CANCELLED = Integration::ResourceId(0) - 2; -namespace SlpPlatform +namespace TizenPlatform { namespace @@ -295,8 +295,8 @@ void ResourceThreadBase::ProcessNextRequest() void ResourceThreadBase::InstallLogging() { - // resource loading thread will send its logs to SLP Platform's LogMessage handler. - Dali::Integration::Log::InstallLogFunction(Dali::SlpPlatform::LogMessage); + // resource loading thread will send its logs to TIZEN Platform's LogMessage handler. + Dali::Integration::Log::InstallLogFunction(Dali::TizenPlatform::LogMessage); } void ResourceThreadBase::UninstallLogging() @@ -319,6 +319,6 @@ void ResourceThreadBase::Decode(const Integration::ResourceRequest& request) ///! If you need this for a subclassed thread, look to ResourceThreadImage::Decode() for an example implementation. } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/resource-loader/resource-thread-base.h b/platform-abstractions/tizen/resource-loader/resource-thread-base.h similarity index 95% rename from platform-abstractions/slp/resource-loader/resource-thread-base.h rename to platform-abstractions/tizen/resource-loader/resource-thread-base.h index ae5aadd..3034c86 100644 --- a/platform-abstractions/slp/resource-loader/resource-thread-base.h +++ b/platform-abstractions/tizen/resource-loader/resource-thread-base.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_RESOURCE_THREAD_BASE_H__ -#define __DALI_SLP_PLATFORM_RESOURCE_THREAD_BASE_H__ +#ifndef __DALI_TIZEN_PLATFORM_RESOURCE_THREAD_BASE_H__ +#define __DALI_TIZEN_PLATFORM_RESOURCE_THREAD_BASE_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -31,7 +31,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { /** @@ -171,8 +171,8 @@ public: #endif }; // class ResourceThreadBase -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLPPLATFORM_RESOURCE_THREAD_BASE_H__ +#endif // __DALI_TIZEN_PLATFORM_RESOURCE_THREAD_BASE_H__ diff --git a/platform-abstractions/slp/resource-loader/resource-thread-image.cpp b/platform-abstractions/tizen/resource-loader/resource-thread-image.cpp similarity index 99% rename from platform-abstractions/slp/resource-loader/resource-thread-image.cpp rename to platform-abstractions/tizen/resource-loader/resource-thread-image.cpp index a339807..381a953 100755 --- a/platform-abstractions/slp/resource-loader/resource-thread-image.cpp +++ b/platform-abstractions/tizen/resource-loader/resource-thread-image.cpp @@ -30,7 +30,7 @@ using namespace Dali::Integration; namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { ResourceThreadImage::ResourceThreadImage(ResourceLoader& resourceLoader, bool forRemoteImage) @@ -265,6 +265,6 @@ void ResourceThreadImage::DecodeImageFromMemory(void* blobBytes, size_t blobSize } } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/resource-loader/resource-thread-image.h b/platform-abstractions/tizen/resource-loader/resource-thread-image.h similarity index 92% rename from platform-abstractions/slp/resource-loader/resource-thread-image.h rename to platform-abstractions/tizen/resource-loader/resource-thread-image.h index 9b5079b..d2a1b9f 100644 --- a/platform-abstractions/slp/resource-loader/resource-thread-image.h +++ b/platform-abstractions/tizen/resource-loader/resource-thread-image.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_RESOURCE_THREAD_IMAGE_H__ -#define __DALI_SLP_PLATFORM_RESOURCE_THREAD_IMAGE_H__ +#ifndef __DALI_TIZEN_PLATFORM_RESOURCE_THREAD_IMAGE_H__ +#define __DALI_TIZEN_PLATFORM_RESOURCE_THREAD_IMAGE_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -25,7 +25,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { class ResourceThreadImage : public ResourceThreadBase @@ -87,8 +87,8 @@ private: void DecodeImageFromMemory(void* blobBytes, size_t blobSize, const Integration::ResourceRequest& request); }; // class ResourceThreadImage -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_RESOURCE_THREAD_IMAGE_H__ +#endif // __DALI_TIZEN_PLATFORM_RESOURCE_THREAD_IMAGE_H__ diff --git a/platform-abstractions/slp/resource-loader/resource-thread-shader.cpp b/platform-abstractions/tizen/resource-loader/resource-thread-shader.cpp similarity index 98% rename from platform-abstractions/slp/resource-loader/resource-thread-shader.cpp rename to platform-abstractions/tizen/resource-loader/resource-thread-shader.cpp index 886e700..0bad530 100644 --- a/platform-abstractions/slp/resource-loader/resource-thread-shader.cpp +++ b/platform-abstractions/tizen/resource-loader/resource-thread-shader.cpp @@ -29,7 +29,7 @@ using boost::unique_lock; namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { ResourceThreadShader::ResourceThreadShader(ResourceLoader& resourceLoader) @@ -96,6 +96,6 @@ void ResourceThreadShader::Save(const ResourceRequest& request) } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/resource-loader/resource-thread-shader.h b/platform-abstractions/tizen/resource-loader/resource-thread-shader.h similarity index 85% rename from platform-abstractions/slp/resource-loader/resource-thread-shader.h rename to platform-abstractions/tizen/resource-loader/resource-thread-shader.h index 5098498..b178b1b 100644 --- a/platform-abstractions/slp/resource-loader/resource-thread-shader.h +++ b/platform-abstractions/tizen/resource-loader/resource-thread-shader.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_RESOURCE_THREAD_SHADER_H__ -#define __DALI_SLP_PLATFORM_RESOURCE_THREAD_SHADER_H__ +#ifndef __DALI_TIZEN_PLATFORM_RESOURCE_THREAD_SHADER_H__ +#define __DALI_TIZEN_PLATFORM_RESOURCE_THREAD_SHADER_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -33,7 +33,7 @@ class Filter; } } -namespace SlpPlatform +namespace TizenPlatform { class ResourceThreadShader : public ResourceThreadBase @@ -65,8 +65,8 @@ private: }; // class ResourceThreadShader -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_RESOURCE_THREAD_SHADER_H__ +#endif // __DALI_TIZEN_PLATFORM_RESOURCE_THREAD_SHADER_H__ diff --git a/platform-abstractions/slp/resource-loader/resource-thread-text.cpp b/platform-abstractions/tizen/resource-loader/resource-thread-text.cpp similarity index 99% rename from platform-abstractions/slp/resource-loader/resource-thread-text.cpp rename to platform-abstractions/tizen/resource-loader/resource-thread-text.cpp index 779420b..782e1df 100644 --- a/platform-abstractions/slp/resource-loader/resource-thread-text.cpp +++ b/platform-abstractions/tizen/resource-loader/resource-thread-text.cpp @@ -38,7 +38,7 @@ using namespace Dali::Integration; namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { namespace @@ -282,5 +282,5 @@ void ResourceThreadText::DeleteDataCaches() mDataCaches.clear(); } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/resource-loader/resource-thread-text.h b/platform-abstractions/tizen/resource-loader/resource-thread-text.h similarity index 95% rename from platform-abstractions/slp/resource-loader/resource-thread-text.h rename to platform-abstractions/tizen/resource-loader/resource-thread-text.h index 778f00e..e7b0b72 100644 --- a/platform-abstractions/slp/resource-loader/resource-thread-text.h +++ b/platform-abstractions/tizen/resource-loader/resource-thread-text.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_RESOURCE_THREAD_TEXT_H__ -#define __DALI_SLP_PLATFORM_RESOURCE_THREAD_TEXT_H__ +#ifndef __DALI_TIZEN_PLATFORM_RESOURCE_THREAD_TEXT_H__ +#define __DALI_TIZEN_PLATFORM_RESOURCE_THREAD_TEXT_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -38,7 +38,7 @@ namespace Platform class DataCache; } -namespace SlpPlatform +namespace TizenPlatform { /** * Resource loader for glyph distance fields. @@ -137,8 +137,8 @@ private: }; // class ResourceThreadText -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_RESOURCE_THREAD_TEXT_H__ +#endif // __DALI_TIZEN_PLATFORM_RESOURCE_THREAD_TEXT_H__ diff --git a/platform-abstractions/slp/slp-font-configuration-parser.cpp b/platform-abstractions/tizen/tizen-font-configuration-parser.cpp similarity index 96% rename from platform-abstractions/slp/slp-font-configuration-parser.cpp rename to platform-abstractions/tizen/tizen-font-configuration-parser.cpp index b3280cc..a1dc8f7 100644 --- a/platform-abstractions/slp/slp-font-configuration-parser.cpp +++ b/platform-abstractions/tizen/tizen-font-configuration-parser.cpp @@ -15,7 +15,7 @@ * */ -#include "slp-font-configuration-parser.h" +#include "tizen-font-configuration-parser.h" #include #include @@ -26,7 +26,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { namespace FontConfigurationParser @@ -35,7 +35,7 @@ namespace FontConfigurationParser #if defined(DEBUG_ENABLED) namespace { -Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_SLP_FONT_CONFIGURATION_PARSER"); +Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_TIZEN_FONT_CONFIGURATION_PARSER"); } #endif @@ -132,6 +132,6 @@ void Parse(std::string confFile, std::string& fontFamily, std::string& fontStyle } // namespace FontConfParser -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/slp-font-configuration-parser.h b/platform-abstractions/tizen/tizen-font-configuration-parser.h similarity index 83% rename from platform-abstractions/slp/slp-font-configuration-parser.h rename to platform-abstractions/tizen/tizen-font-configuration-parser.h index 5da7a18..2450e71 100644 --- a/platform-abstractions/slp/slp-font-configuration-parser.h +++ b/platform-abstractions/tizen/tizen-font-configuration-parser.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_FONT_CONFIGURATION_PARSER_H__ -#define __DALI_SLP_PLATFORM_FONT_CONFIGURATION_PARSER_H__ +#ifndef __DALI_TIZEN_PLATFORM_FONT_CONFIGURATION_PARSER_H__ +#define __DALI_TIZEN_PLATFORM_FONT_CONFIGURATION_PARSER_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -23,7 +23,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { namespace FontConfigurationParser @@ -39,8 +39,8 @@ void Parse(std::string confFile, std::string& fontFamily, std::string& fontStyle } // namespace FontConfParser -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_FONT_CONFIGURATION_PARSER_H__ +#endif // __DALI_TIZEN_PLATFORM_FONT_CONFIGURATION_PARSER_H__ diff --git a/platform-abstractions/slp/slp-logging.cpp b/platform-abstractions/tizen/tizen-logging.cpp similarity index 96% rename from platform-abstractions/slp/slp-logging.cpp rename to platform-abstractions/tizen/tizen-logging.cpp index dc54e0d..af14633 100644 --- a/platform-abstractions/slp/slp-logging.cpp +++ b/platform-abstractions/tizen/tizen-logging.cpp @@ -16,7 +16,7 @@ */ // FUNCTION HEADER -#include "slp-logging.h" +#include "tizen-logging.h" // EXTERNAL INCLUDES #ifndef DALI_PROFILE_UBUNTU @@ -28,7 +28,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { void LogMessage(Dali::Integration::Log::DebugPriority level, std::string& message) @@ -72,6 +72,6 @@ void LogMessage(Dali::Integration::Log::DebugPriority level, std::string& messag #endif // DALI_PROFILE_UBUNTU } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/slp-logging.h b/platform-abstractions/tizen/tizen-logging.h similarity index 84% rename from platform-abstractions/slp/slp-logging.h rename to platform-abstractions/tizen/tizen-logging.h index 92a4425..6165227 100644 --- a/platform-abstractions/slp/slp-logging.h +++ b/platform-abstractions/tizen/tizen-logging.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_LOGGING_H__ -#define __DALI_SLP_LOGGING_H__ +#ifndef __DALI_TIZEN_LOGGING_H__ +#define __DALI_TIZEN_LOGGING_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -24,7 +24,7 @@ namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { /** @@ -32,8 +32,8 @@ namespace SlpPlatform */ void LogMessage(Dali::Integration::Log::DebugPriority level, std::string& message); -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_LOGGING_H__ +#endif // __DALI_TIZEN_LOGGING_H__ diff --git a/platform-abstractions/slp/slp-platform-abstraction.cpp b/platform-abstractions/tizen/tizen-platform-abstraction.cpp similarity index 71% rename from platform-abstractions/slp/slp-platform-abstraction.cpp rename to platform-abstractions/tizen/tizen-platform-abstraction.cpp index 799139f..1b7f935 100644 --- a/platform-abstractions/slp/slp-platform-abstraction.cpp +++ b/platform-abstractions/tizen/tizen-platform-abstraction.cpp @@ -15,7 +15,7 @@ * */ -#include "slp-platform-abstraction.h" +#include "tizen-platform-abstraction.h" #ifndef DALI_PROFILE_UBUNTU #include @@ -29,7 +29,7 @@ #include "resource-loader/resource-loader.h" #include "dynamics/dynamics-factory.h" -#include "slp-font-configuration-parser.h" +#include "tizen-font-configuration-parser.h" #include "data-cache/metrics-cache.h" #include "image-loaders/image-loader.h" @@ -38,11 +38,11 @@ namespace Dali Integration::PlatformAbstraction* CreatePlatformAbstraction() { - return new SlpPlatform::SlpPlatformAbstraction(); + return new TizenPlatform::TizenPlatformAbstraction(); } -namespace SlpPlatform +namespace TizenPlatform { namespace @@ -64,7 +64,7 @@ const float FONT_SIZE_TABLE[5] = }; } -SlpPlatformAbstraction::SlpPlatformAbstraction() +TizenPlatformAbstraction::TizenPlatformAbstraction() : mResourceLoader(new ResourceLoader), mDynamicsFactory(NULL), mDataStoragePath( "" ), @@ -76,7 +76,7 @@ SlpPlatformAbstraction::SlpPlatformAbstraction() UpdateDefaultsFromDevice(); } -SlpPlatformAbstraction::~SlpPlatformAbstraction() +TizenPlatformAbstraction::~TizenPlatformAbstraction() { delete mResourceLoader; delete mDynamicsFactory; @@ -87,7 +87,7 @@ SlpPlatformAbstraction::~SlpPlatformAbstraction() } } -void SlpPlatformAbstraction::GetTimeMicroseconds(unsigned int &seconds, unsigned int µSeconds) +void TizenPlatformAbstraction::GetTimeMicroseconds(unsigned int &seconds, unsigned int µSeconds) { timespec time; clock_gettime(CLOCK_MONOTONIC, &time); @@ -95,7 +95,7 @@ void SlpPlatformAbstraction::GetTimeMicroseconds(unsigned int &seconds, unsigned microSeconds = time.tv_nsec / NANOSECS_TO_MICROSECS; } -void SlpPlatformAbstraction::Suspend() +void TizenPlatformAbstraction::Suspend() { if (mResourceLoader) { @@ -103,7 +103,7 @@ void SlpPlatformAbstraction::Suspend() } } -void SlpPlatformAbstraction::Resume() +void TizenPlatformAbstraction::Resume() { if (mResourceLoader) { @@ -111,18 +111,18 @@ void SlpPlatformAbstraction::Resume() } } -const std::string& SlpPlatformAbstraction::GetDefaultFontFamily() const +const std::string& TizenPlatformAbstraction::GetDefaultFontFamily() const { // VCC TODO: return default font style as well. return mDefaultFontFamily; } -float SlpPlatformAbstraction::GetDefaultFontSize() const +float TizenPlatformAbstraction::GetDefaultFontSize() const { return mDefaultFontSize; } -PixelSize SlpPlatformAbstraction::GetFontLineHeightFromCapsHeight(const std::string& fontFamily, const std::string& fontStyle, CapsHeight capsHeight) const +PixelSize TizenPlatformAbstraction::GetFontLineHeightFromCapsHeight(const std::string& fontFamily, const std::string& fontStyle, CapsHeight capsHeight) const { PixelSize result(0); @@ -134,7 +134,7 @@ PixelSize SlpPlatformAbstraction::GetFontLineHeightFromCapsHeight(const std::str return result; } -Integration::GlyphSet* SlpPlatformAbstraction::GetGlyphData ( const Dali::Integration::TextResourceType& textRequest, +Integration::GlyphSet* TizenPlatformAbstraction::GetGlyphData ( const Dali::Integration::TextResourceType& textRequest, const std::string& fontFamily, bool getBitmap) const { @@ -148,7 +148,7 @@ Integration::GlyphSet* SlpPlatformAbstraction::GetGlyphData ( const Dali::Integr return NULL; } -Integration::GlyphSet* SlpPlatformAbstraction::GetCachedGlyphData( const Integration::TextResourceType& textRequest, +Integration::GlyphSet* TizenPlatformAbstraction::GetCachedGlyphData( const Integration::TextResourceType& textRequest, const std::string& fontFamily ) const { if (mResourceLoader) @@ -159,7 +159,7 @@ Integration::GlyphSet* SlpPlatformAbstraction::GetCachedGlyphData( const Integra } -void SlpPlatformAbstraction::GetGlobalMetrics( const std::string& fontFamily, const std::string& fontStyle, Integration::GlobalMetrics& globalMetrics ) const +void TizenPlatformAbstraction::GetGlobalMetrics( const std::string& fontFamily, const std::string& fontStyle, Integration::GlobalMetrics& globalMetrics ) const { if( mResourceLoader ) { @@ -170,7 +170,7 @@ void SlpPlatformAbstraction::GetGlobalMetrics( const std::string& fontFamily, co } } -void SlpPlatformAbstraction::GetClosestImageSize( const std::string& filename, +void TizenPlatformAbstraction::GetClosestImageSize( const std::string& filename, const ImageAttributes& attributes, Vector2& closestSize ) { @@ -178,7 +178,7 @@ void SlpPlatformAbstraction::GetClosestImageSize( const std::string& filename, ImageLoader::GetClosestImageSize(filename, attributes, closestSize ); } -void SlpPlatformAbstraction::GetClosestImageSize( Integration::ResourcePointer resourceBuffer, +void TizenPlatformAbstraction::GetClosestImageSize( Integration::ResourcePointer resourceBuffer, const ImageAttributes& attributes, Vector2& closestSize ) { @@ -187,7 +187,7 @@ void SlpPlatformAbstraction::GetClosestImageSize( Integration::ResourcePointer r } -void SlpPlatformAbstraction::LoadResource(const Integration::ResourceRequest& request) +void TizenPlatformAbstraction::LoadResource(const Integration::ResourceRequest& request) { if (mResourceLoader) { @@ -195,13 +195,13 @@ void SlpPlatformAbstraction::LoadResource(const Integration::ResourceRequest& re } } -Integration::ResourcePointer SlpPlatformAbstraction::LoadResourceSynchronously(const Integration::ResourceType& resourceType, const std::string& resourcePath) +Integration::ResourcePointer TizenPlatformAbstraction::LoadResourceSynchronously(const Integration::ResourceType& resourceType, const std::string& resourcePath) { return ImageLoader::LoadResourceSynchronously( resourceType, resourcePath ); } -void SlpPlatformAbstraction::SaveResource(const Integration::ResourceRequest& request) +void TizenPlatformAbstraction::SaveResource(const Integration::ResourceRequest& request) { if (mResourceLoader) { @@ -222,7 +222,7 @@ void SlpPlatformAbstraction::SaveResource(const Integration::ResourceRequest& re } } -void SlpPlatformAbstraction::CancelLoad(Integration::ResourceId id, Integration::ResourceTypeId typeId) +void TizenPlatformAbstraction::CancelLoad(Integration::ResourceId id, Integration::ResourceTypeId typeId) { if (mResourceLoader) { @@ -230,7 +230,7 @@ void SlpPlatformAbstraction::CancelLoad(Integration::ResourceId id, Integration: } } -bool SlpPlatformAbstraction::IsLoading() +bool TizenPlatformAbstraction::IsLoading() { if (mResourceLoader) { @@ -240,7 +240,7 @@ bool SlpPlatformAbstraction::IsLoading() return false; } -void SlpPlatformAbstraction::GetResources(Integration::ResourceCache& cache) +void TizenPlatformAbstraction::GetResources(Integration::ResourceCache& cache) { if (mResourceLoader) { @@ -248,7 +248,7 @@ void SlpPlatformAbstraction::GetResources(Integration::ResourceCache& cache) } } -void SlpPlatformAbstraction::SetDpi(unsigned int dpiHor, unsigned int dpiVer) +void TizenPlatformAbstraction::SetDpi(unsigned int dpiHor, unsigned int dpiVer) { if (mResourceLoader) { @@ -256,7 +256,7 @@ void SlpPlatformAbstraction::SetDpi(unsigned int dpiHor, unsigned int dpiVer) } } -const std::string& SlpPlatformAbstraction::GetFontFamilyForChars(const Integration::TextArray& charsRequested) const +const std::string& TizenPlatformAbstraction::GetFontFamilyForChars(const Integration::TextArray& charsRequested) const { if( mResourceLoader ) { @@ -266,7 +266,7 @@ const std::string& SlpPlatformAbstraction::GetFontFamilyForChars(const Integrati return NULL_FONT_FAMILY_NAME; } -bool SlpPlatformAbstraction::AllGlyphsSupported(const std::string &fontFamily, const std::string& fontStyle, const Integration::TextArray& charsRequested) const +bool TizenPlatformAbstraction::AllGlyphsSupported(const std::string &fontFamily, const std::string& fontStyle, const Integration::TextArray& charsRequested) const { bool ret = false; if (mResourceLoader) @@ -276,7 +276,7 @@ bool SlpPlatformAbstraction::AllGlyphsSupported(const std::string &fontFamily, c return ret; } -bool SlpPlatformAbstraction::ValidateFontFamilyName(const std::string& fontFamily, const std::string& fontStyle, bool& isDefaultSystemFont, std::string& closestMatch, std::string& closestStyleMatch) const +bool TizenPlatformAbstraction::ValidateFontFamilyName(const std::string& fontFamily, const std::string& fontStyle, bool& isDefaultSystemFont, std::string& closestMatch, std::string& closestStyleMatch) const { bool ret = false; if( mResourceLoader ) @@ -290,7 +290,7 @@ bool SlpPlatformAbstraction::ValidateFontFamilyName(const std::string& fontFamil return ret; } -void SlpPlatformAbstraction::GetFontList( Dali::Integration::PlatformAbstraction::FontListMode mode, std::vector& fontList ) const +void TizenPlatformAbstraction::GetFontList( Dali::Integration::PlatformAbstraction::FontListMode mode, std::vector& fontList ) const { if( mResourceLoader ) { @@ -298,7 +298,7 @@ void SlpPlatformAbstraction::GetFontList( Dali::Integration::PlatformAbstractio } } -bool SlpPlatformAbstraction::LoadFile( const std::string& filename, std::vector< unsigned char >& buffer ) const +bool TizenPlatformAbstraction::LoadFile( const std::string& filename, std::vector< unsigned char >& buffer ) const { bool result = false; @@ -310,7 +310,7 @@ bool SlpPlatformAbstraction::LoadFile( const std::string& filename, std::vector< return result; } -std::string SlpPlatformAbstraction::LoadFile( const std::string& filename ) +std::string TizenPlatformAbstraction::LoadFile( const std::string& filename ) { std::string result; if (mResourceLoader) @@ -321,7 +321,7 @@ std::string SlpPlatformAbstraction::LoadFile( const std::string& filename ) return result; } -bool SlpPlatformAbstraction::SaveFile(const std::string& filename, std::vector< unsigned char >& buffer) const +bool TizenPlatformAbstraction::SaveFile(const std::string& filename, std::vector< unsigned char >& buffer) const { bool result = false; @@ -333,13 +333,13 @@ bool SlpPlatformAbstraction::SaveFile(const std::string& filename, std::vector< return result; } -void SlpPlatformAbstraction::JoinLoaderThreads() +void TizenPlatformAbstraction::JoinLoaderThreads() { delete mResourceLoader; mResourceLoader = NULL; } -void SlpPlatformAbstraction::UpdateDefaultsFromDevice() +void TizenPlatformAbstraction::UpdateDefaultsFromDevice() { // FontConfigurationParser::Parse sets the default font family and the default font style. // If the isn't a configuration file or is invalid, or it doesn't have any tag with the default @@ -363,7 +363,7 @@ void SlpPlatformAbstraction::UpdateDefaultsFromDevice() mDefaultFontSize = FONT_SIZE_TABLE[fontSize]; } -Integration::DynamicsFactory* SlpPlatformAbstraction::GetDynamicsFactory() +Integration::DynamicsFactory* TizenPlatformAbstraction::GetDynamicsFactory() { if( NULL == mDynamicsFactory ) { @@ -373,35 +373,35 @@ Integration::DynamicsFactory* SlpPlatformAbstraction::GetDynamicsFactory() return mDynamicsFactory; } -bool SlpPlatformAbstraction::ReadGlobalMetricsFromCache( const std::string& fontFamily, +bool TizenPlatformAbstraction::ReadGlobalMetricsFromCache( const std::string& fontFamily, const std::string& fontStyle, Integration::GlobalMetrics& globalMetrics ) { return MetricsCache::ReadGlobal( fontFamily, fontStyle, globalMetrics ); } -void SlpPlatformAbstraction::WriteGlobalMetricsToCache( const std::string& fontFamily, +void TizenPlatformAbstraction::WriteGlobalMetricsToCache( const std::string& fontFamily, const std::string& fontStyle, const Integration::GlobalMetrics& globalMetrics ) { MetricsCache::WriteGlobal( fontFamily, fontStyle, globalMetrics); } -bool SlpPlatformAbstraction::ReadMetricsFromCache( const std::string& fontFamily, +bool TizenPlatformAbstraction::ReadMetricsFromCache( const std::string& fontFamily, const std::string& fontStyle, std::vector& glyphMetricsContainer ) { return MetricsCache::Read( fontFamily, fontStyle, glyphMetricsContainer ); } -void SlpPlatformAbstraction::WriteMetricsToCache( const std::string& fontFamily, +void TizenPlatformAbstraction::WriteMetricsToCache( const std::string& fontFamily, const std::string& fontStyle, const Integration::GlyphSet& glyphSet ) { MetricsCache::Write( fontFamily, fontStyle, glyphSet ); } -void SlpPlatformAbstraction::GetFileNamesFromDirectory( const std::string& directoryName, +void TizenPlatformAbstraction::GetFileNamesFromDirectory( const std::string& directoryName, std::vector& fileNames ) { dirent* de = NULL; @@ -429,7 +429,7 @@ void SlpPlatformAbstraction::GetFileNamesFromDirectory( const std::string& direc } } -Integration::BitmapPtr SlpPlatformAbstraction::GetGlyphImage( const std::string& fontFamily, const std::string& fontStyle, const float fontSize, const uint32_t character ) const +Integration::BitmapPtr TizenPlatformAbstraction::GetGlyphImage( const std::string& fontFamily, const std::string& fontStyle, const float fontSize, const uint32_t character ) const { Integration::BitmapPtr glyphImage; @@ -441,7 +441,7 @@ Integration::BitmapPtr SlpPlatformAbstraction::GetGlyphImage( const std::string& return glyphImage; } -bool SlpPlatformAbstraction::LoadShaderBinFile( const std::string& filename, std::vector< unsigned char >& buffer ) const +bool TizenPlatformAbstraction::LoadShaderBinFile( const std::string& filename, std::vector< unsigned char >& buffer ) const { bool result = false; @@ -466,11 +466,11 @@ bool SlpPlatformAbstraction::LoadShaderBinFile( const std::string& filename, std return result; } -void SlpPlatformAbstraction::SetDataStoragePath( const std::string& path ) +void TizenPlatformAbstraction::SetDataStoragePath( const std::string& path ) { mDataStoragePath = path; } -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali diff --git a/platform-abstractions/slp/slp-platform-abstraction.h b/platform-abstractions/tizen/tizen-platform-abstraction.h similarity index 96% rename from platform-abstractions/slp/slp-platform-abstraction.h rename to platform-abstractions/tizen/tizen-platform-abstraction.h index 5201a0f..638cb49 100644 --- a/platform-abstractions/slp/slp-platform-abstraction.h +++ b/platform-abstractions/tizen/tizen-platform-abstraction.h @@ -1,5 +1,5 @@ -#ifndef __DALI_SLP_PLATFORM_ABSTRACTION_H__ -#define __DALI_SLP_PLATFORM_ABSTRACTION_H__ +#ifndef __DALI_TIZEN_PLATFORM_ABSTRACTION_H__ +#define __DALI_TIZEN_PLATFORM_ABSTRACTION_H__ /* * Copyright (c) 2014 Samsung Electronics Co., Ltd. @@ -34,7 +34,7 @@ namespace Dali */ Integration::PlatformAbstraction* CreatePlatformAbstraction(); -namespace SlpPlatform +namespace TizenPlatform { class DynamicsFactory; @@ -43,7 +43,7 @@ class ResourceLoader; /** * Concrete implementation of the platform abstraction class. */ -class SlpPlatformAbstraction : public Integration::PlatformAbstraction +class TizenPlatformAbstraction : public Integration::PlatformAbstraction { public: // Construction & Destruction @@ -51,12 +51,12 @@ public: // Construction & Destruction /** * Constructor */ - SlpPlatformAbstraction(); + TizenPlatformAbstraction(); /** * Destructor */ - virtual ~SlpPlatformAbstraction(); + virtual ~TizenPlatformAbstraction(); public: // PlatformAbstraction overrides @@ -270,7 +270,7 @@ private: float mDefaultFontSize; }; -} // namespace SlpPlatform +} // namespace TizenPlatform } // namespace Dali -#endif // __DALI_SLP_PLATFORM_ABSTRACTION_H__ +#endif // __DALI_TIZEN_PLATFORM_ABSTRACTION_H__ -- 2.7.4