$(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS) \
$(CAPI_SYSTEM_INFO_CFLAGS) \
$(TTS_CFLAGS) \
- $(SENSOR_CFLAGS)
-
-LIBDALI_ADAPTOR_LA_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \
- $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \
- $(CAPI_SYSTEM_INFO_LIBS) \
- $(TTS_LIBS) \
- $(SENSOR_LIBS)
-if USE_APPFW_EFL_BASE
-LIBDALI_ADAPTOR_LA_CXXFLAGS += $(ELEMENTARY_CFLAGS)
-
-LIBDALI_ADAPTOR_LA_LIBADD += $(ELEMENTARY_LIBS)
-
-else
-LIBDALI_ADAPTOR_LA_CXXFLAGS += $(BUNDLE_CFLAGS) \
+ $(SENSOR_CFLAGS) \
+ $(BUNDLE_CFLAGS) \
$(CAPI_APPFW_COMMON_CFLAGS) \
$(CAPI_APPFW_CONTROL_CFLAGS) \
$(CAPI_APPFW_WIDGET_BASE_CFLAGS) \
$(ECORE_IMF_CFLAGS) \
- $(FRIBIDI_CFLAGS) \
- -DWIDGET_SUPPOERTED
+ $(FRIBIDI_CFLAGS)
-LIBDALI_ADAPTOR_LA_LIBADD += $(BUNDLE_LIBS) \
+LIBDALI_ADAPTOR_LA_LIBADD += $(CAPI_APPFW_APPLICATION_LIBS) \
+ $(CAPI_SYSTEM_SYSTEM_SETTINGS_LIBS) \
+ $(CAPI_SYSTEM_INFO_LIBS) \
+ $(TTS_LIBS) \
+ $(SENSOR_LIBS) \
+ $(BUNDLE_LIBS) \
$(CAPI_APPFW_COMMON_LIBS) \
$(CAPI_APPFW_CONTROL_LIBS) \
$(CAPI_APPFW_WIDGET_BASE_LIBS) \
$(ECORE_IMF_LIBS) \
$(FRIBIDI_LIBS)
-endif
+
else
LIBDALI_ADAPTOR_LA_CXXFLAGS += $(ELEMENTARY_CFLAGS)
AM_CONDITIONAL([WAYLAND], [test x$enable_wayland = xyes])
AM_CONDITIONAL([ECORE_WAYLAND2], [test x$enable_ecore_wayland2 = xyes])
AM_CONDITIONAL([USE_APPFW], [test x$enable_appfw = xyes])
-AM_CONDITIONAL([USE_APPFW_EFL_BASE], [test x$enable_tizen_major_version = x3])
AM_CONDITIONAL([ENABLE_CXX03_ABI], [test x$enable_cxx03_abi = xyes])
AM_CONDITIONAL([ENABLE_RENAME_SO], [test x$enable_rename_so = xyes])
return dimension;
}
+ImageDimensions GetOriginalImageSize( const std::string& filename )
+{
+ return TizenPlatform::ImageLoader::GetClosestImageSize( filename, ImageDimensions(0, 0), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, true );
+}
Devel::PixelBuffer DownloadImageSynchronously( const std::string& url, ImageDimensions size, FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection )
{
bool orientationCorrection = true );
/**
+ * @brief Get the size of an original image
+ * @param[in] filename name of the image.
+ *
+ * @return dimensions to original image
+ */
+DALI_ADAPTOR_API ImageDimensions GetOriginalImageSize(
+ const std::string& filename);
+
+/**
* @brief Load an image synchronously from a remote resource.
*
* @param [in] url The URL of the image file to load.
virtual ~VectorAnimationRendererPlugin() {}
/**
- * @brief Creates a renderer to render an vector animation file.
+ * @brief Sets the url of the animation file.
*
- * @param[in] url The url of an animation file
- * @param[in] renderer The renderer used to render the image
- * @param[in] width The target image width
- * @param[in] height The target image height
- * @return True if the renderer is successfully created, false otherwise
+ * @param[in] url The url of the animation file
+ */
+ virtual void SetUrl( const std::string& url ) = 0;
+
+ /**
+ * @brief Sets the renderer used to display the result image.
+ *
+ * @param[in] renderer The renderer used to display the result image
*/
- virtual bool CreateRenderer( const std::string& url, Renderer renderer, uint32_t width, uint32_t height ) = 0;
+ virtual void SetRenderer( Renderer renderer ) = 0;
/**
* @brief Sets the target image size.
namespace Dali
{
-VectorAnimationRenderer VectorAnimationRenderer::New( const std::string& url, Renderer renderer, uint32_t width, uint32_t height )
+VectorAnimationRenderer VectorAnimationRenderer::New( const std::string& url )
{
Internal::Adaptor::VectorAnimationRendererPtr animationRenderer = Internal::Adaptor::VectorAnimationRenderer::New();
if( animationRenderer )
{
- animationRenderer->Initialize( url, renderer, width, height );
+ animationRenderer->Initialize( url );
}
return VectorAnimationRenderer( animationRenderer.Get() );
return *this;
}
+void VectorAnimationRenderer::SetRenderer( Renderer renderer )
+{
+ GetImplementation( *this ).SetRenderer( renderer );
+}
+
void VectorAnimationRenderer::SetSize( uint32_t width, uint32_t height )
{
GetImplementation( *this ).SetSize( width, height );
* @brief Creates an initialized handle to a new VectorAnimationRenderer.
*
* @param[in] url The url of the vector animation file
- * @param[in] renderer The renderer used to render the image
- * @param[in] width The width of the content
- * @param[in] height The height of the content
* @return A handle to a newly allocated VectorAnimationRenderer
*/
- static VectorAnimationRenderer New( const std::string& url, Renderer renderer, uint32_t width, uint32_t height );
+ static VectorAnimationRenderer New( const std::string& url );
/**
* @brief Creates an empty handle.
VectorAnimationRenderer& operator=( const VectorAnimationRenderer& rhs );
/**
+ * @brief Sets the renderer used to display the result image.
+ *
+ * @param[in] renderer The renderer used to display the result image
+ */
+ void SetRenderer( Renderer renderer );
+
+ /**
* @brief Sets the target image size.
*
* @param[in] width The target image width
#include <dali/public-api/math/rect.h>
#include <dali/public-api/events/touch-event.h>
#include <dali/public-api/common/view-mode.h>
+#include <dali/integration-api/processor-interface.h>
// INTERNAL INCLUDES
#include <dali/public-api/adaptor-framework/window.h>
*/
const LogFactoryInterface& GetLogFactory();
+ /**
+ * @brief Register a processor implementing the Integration::Processor interface with dali-core.
+ * @param[in] processor the Processor to register
+ * @note using this api does not maintain the processor's lifecycle, must be done elsewhere.
+ */
+ void RegisterProcessor( Integration::Processor& processor );
+
+ /**
+ * @brief Unregister a previously registered processor from dali-core.
+ * @param[in] processor the Processor to unregister
+ */
+ void UnregisterProcessor( Integration::Processor& processor );
+
public: // Signals
/**
#include <dali/integration-api/profiling.h>
#include <dali/integration-api/input-options.h>
#include <dali/integration-api/events/touch-event-integ.h>
+#include <dali/integration-api/processor-interface.h>
// INTERNAL INCLUDES
#include <dali/public-api/dali-adaptor-common.h>
return *mEnvironmentOptions;
}
+void Adaptor::RegisterProcessor( Integration::Processor& processor )
+{
+ GetCore().RegisterProcessor(processor);
+}
+
+void Adaptor::UnregisterProcessor( Integration::Processor& processor )
+{
+ GetCore().UnregisterProcessor(processor);
+}
+
void Adaptor::RequestUpdateOnce()
{
if( mThreadController )
{
class Core;
class GlAbstraction;
+class Processor;
}
namespace Internal
*/
const LogFactoryInterface& GetLogFactory();
+ /**
+ * @copydoc Dali::Adaptor::RegisterProcessor
+ */
+ void RegisterProcessor( Integration::Processor& processor );
+
+ /**
+ * @coydoc Dali::Adaptor::UnregisterProcessor
+ */
+ void UnregisterProcessor( Integration::Processor& processor );
+
public: //AdaptorInternalServices
/**
return mImpl->GetLogFactory();
}
+void Adaptor::RegisterProcessor( Integration::Processor& processor )
+{
+ mImpl->RegisterProcessor( processor );
+}
+
+void Adaptor::UnregisterProcessor( Integration::Processor& processor )
+{
+ mImpl->UnregisterProcessor( processor );
+}
+
Adaptor::Adaptor()
: mImpl( NULL )
{
// CLASS HEADER
#include <dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h>
+#include <dali/internal/system/common/environment-variables.h>
namespace Dali
{
namespace Adaptor
{
+namespace
+{
+
+unsigned int GetEnvWatchRenderRefreshRate()
+{
+ const char* envVariable = std::getenv( DALI_WATCH_REFRESH_RATE );
+
+ return envVariable ? std::atoi( envVariable ) : 2u; // Default 30 fps
+}
+
+} // unnamed namespace
+
WatchApplicationPtr WatchApplication::New(
int* argc,
char **argv[],
{
Application::OnInit();
- Dali::Adaptor::Get().SetRenderRefreshRate( 2 ); // make 30 fps for watch applications
+ Dali::Adaptor::Get().SetRenderRefreshRate( GetEnvWatchRenderRefreshRate() );
mState = INITIALIZED;
}
{
const int CONNECTION_TIMEOUT_SECONDS( 30L );
+const int TIMEOUT_SECONDS( 120L );
const long VERBOSE_MODE = 0L; // 0 == off, 1 == on
const long CLOSE_CONNECTION_ON_ERROR = 1L; // 0 == off, 1 == on
const long EXCLUDE_HEADER = 0L;
// CURLOPT_FAILONERROR is not fail-safe especially when authentication is involved ( see manual )
// Removed CURLOPT_FAILONERROR option
curl_easy_setopt( curlHandle, CURLOPT_CONNECTTIMEOUT, CONNECTION_TIMEOUT_SECONDS );
+ curl_easy_setopt( curlHandle, CURLOPT_TIMEOUT, TIMEOUT_SECONDS );
curl_easy_setopt( curlHandle, CURLOPT_HEADER, INCLUDE_HEADER );
curl_easy_setopt( curlHandle, CURLOPT_NOBODY, EXCLUDE_BODY );
#define DALI_REFRESH_RATE "DALI_REFRESH_RATE"
+#define DALI_WATCH_REFRESH_RATE "DALI_WATCH_REFRESH_RATE"
+
+#define DALI_WIDGET_REFRESH_RATE "DALI_WIDGET_REFRESH_RATE"
+
#define DALI_ENV_MULTI_SAMPLING_LEVEL "DALI_MULTI_SAMPLING_LEVEL"
#define DALI_ENV_MAX_TEXTURE_SIZE "DALI_MAX_TEXTURE_SIZE"
#include <dali/integration-api/debug.h>
#include <dali/integration-api/core.h>
#include <dali/integration-api/adaptor.h>
+#include <dali/integration-api/processor-interface.h>
#include <dali/internal/adaptor/common/adaptor-impl.h>
// INTERNAL INCLUDES
// INTERNAL INCLUDE
#include <dali/public-api/adaptor-framework/widget.h>
#include <dali/public-api/adaptor-framework/widget-impl.h>
+#include <dali/internal/system/common/environment-variables.h>
#include <dali/internal/system/tizen-wayland/widget-controller-tizen.h>
-#ifdef WIDGET_SUPPOERTED
+// EXTERNAL INCLUDES
#include <bundle.h>
#include <widget_base.h>
-#endif
namespace Dali
{
namespace Internal
{
-#ifdef WIDGET_SUPPOERTED
namespace
{
return 0;
}
-} // anonymous namespace
+unsigned int GetEnvWidgetRenderRefreshRate()
+{
+ const char* envVariable = std::getenv( DALI_WIDGET_REFRESH_RATE );
-#endif
+ return envVariable ? std::atoi( envVariable ) : 1u; // Default 60 fps
+}
+
+} // anonymous namespace
namespace Adaptor
{
-#ifdef WIDGET_SUPPOERTED
-
WidgetApplicationPtr WidgetApplicationTizen::New(
int* argc,
char **argv[],
}
}
-#endif
+void WidgetApplicationTizen::OnInit()
+{
+ WidgetApplication::OnInit();
+
+ Dali::Adaptor::Get().SetRenderRefreshRate( GetEnvWidgetRenderRefreshRate() );
+}
// factory function, must be implemented
namespace WidgetApplicationFactory
*/
Dali::Internal::Adaptor::WidgetApplicationPtr Create( int* argc, char **argv[], const std::string& stylesheet )
{
-#ifdef WIDGET_SUPPOERTED
return WidgetApplicationTizen::New( argc, argv, stylesheet );
-#else
- return nullptr;
-#endif
}
} // namespace Factory
*/
// EXTERNAL INCLUDES
-#ifdef WIDGET_SUPPOERTED
#include <widget_base.h>
-#endif
// INTERNAL INCLUDES
#include <dali/internal/adaptor/common/application-impl.h>
#include <dali/internal/system/common/widget-application-impl.h>
-#ifndef WIDGET_SUPPOERTED
-typedef void* widget_base_instance_h;
-#endif
-
namespace Dali
{
class Widget;
static WidgetApplicationPtr New( int* argc, char **argv[], const std::string& stylesheet );
public:
+ /**
+ * @copydoc Dali::Internal::Adaptor::Application::OnInit()
+ */
+ virtual void OnInit();
/**
* @copydoc Dali::WidgetApplication::RegisterWidgetCreator()
// EXTERNAL INCLUDES
#include <dali/public-api/signals/connection-tracker.h>
+#include <widget_base.h>
// INTERNAL INCLUDES
-#ifdef WIDGET_SUPPOERTED
-#include <widget_base.h>
-#endif
#include <dali/public-api/adaptor-framework/widget-impl.h>
#include <dali/internal/system/common/widget-controller.h>
{
public:
-#ifndef WIDGET_SUPPOERTED
- typedef void* widget_base_instance_h;
-#endif
-
/**
* Constructor
*/
{
}
-void VectorAnimationRenderer::Initialize( const std::string& url, Dali::Renderer renderer, uint32_t width, uint32_t height )
+void VectorAnimationRenderer::Initialize( const std::string& url )
{
- mPlugin.CreateRenderer( url, renderer, width, height );
+ mPlugin.SetUrl( url );
+}
+
+void VectorAnimationRenderer::SetRenderer( Dali::Renderer renderer )
+{
+ mPlugin.SetRenderer( renderer );
}
void VectorAnimationRenderer::SetSize( uint32_t width, uint32_t height )
/**
* @brief Initializes member data.
*/
- void Initialize( const std::string& url, Dali::Renderer renderer, uint32_t width, uint32_t height );
+ void Initialize( const std::string& url );
+
+ /**
+ * @copydoc Dali::VectorAnimationRenderer::SetRenderer()
+ */
+ void SetRenderer( Dali::Renderer renderer );
/**
* @copydoc Dali::VectorAnimationRenderer::SetSize()
}
}
-bool VectorAnimationRendererPluginProxy::CreateRenderer( const std::string& url, Dali::Renderer renderer, uint32_t width, uint32_t height )
+void VectorAnimationRendererPluginProxy::SetUrl( const std::string& url )
{
if( mPlugin )
{
- return mPlugin->CreateRenderer( url, renderer, width, height );
+ mPlugin->SetUrl( url );
+ }
+}
+
+void VectorAnimationRendererPluginProxy::SetRenderer( Dali::Renderer renderer )
+{
+ if( mPlugin )
+ {
+ mPlugin->SetRenderer( renderer );
}
- return false;
}
void VectorAnimationRendererPluginProxy::SetSize( uint32_t width, uint32_t height )
~VectorAnimationRendererPluginProxy();
/**
- * @copydoc Dali::VectorAnimationRendererPlugin::CreateRenderer()
+ * @copydoc Dali::VectorAnimationRendererPlugin::SetUrl()
*/
- bool CreateRenderer( const std::string& url, Dali::Renderer renderer, uint32_t width, uint32_t height );
+ void SetUrl( const std::string& url );
+
+ /**
+ * @copydoc Dali::VectorAnimationRendererPlugin::SetRenderer()
+ */
+ void SetRenderer( Dali::Renderer renderer );
/**
* @copydoc Dali::VectorAnimationRendererPlugin::SetSize()
public: // Stereoscopy
/**
+ * @DEPRECATED_1_3_51
* @brief Sets the viewing mode for the application.
* @SINCE_1_0.0
* @param[in] viewMode The new viewing mode
- * @DEPRECATED_1_3.51
*/
void SetViewMode( ViewMode viewMode );
/**
+ * @DEPRECATED_1_3_51
* @brief Gets the current viewing mode.
* @SINCE_1_0.0
* @return The current viewing mode
- * @DEPRECATED_1_3.51
*/
ViewMode GetViewMode() const;
/**
+ * @DEPRECATED_1_3_51
* @brief Sets the stereo base (eye separation) for Stereoscopic 3D.
*
* The stereo base is the distance in millimetres between the eyes. Typical values are
* between 50mm and 70mm. The default value is 65mm.
* @SINCE_1_0.0
* @param[in] stereoBase The stereo base (eye separation) for Stereoscopic 3D
- * @DEPRECATED_1_3.51
*/
void SetStereoBase( float stereoBase );
/**
+ * @DEPRECATED_1_3_51
* @brief Gets the stereo base (eye separation) for Stereoscopic 3D.
*
* @SINCE_1_0.0
* @return The stereo base (eye separation) for Stereoscopic 3D
- * @DEPRECATED_1_3.51
*/
float GetStereoBase() const;
AppSignalType& ResetSignal();
/**
- * @DEPRECATED_1_1.43 Use Window::ResizedSignal() instead.
+ * @DEPRECATED_1_4.6 Use Window::ResizedSignal() instead.
* @brief This signal is emitted when the window application rendering on is resized.
* @SINCE_1_0.0
* @return The signal to connect to
const unsigned int ADAPTOR_MAJOR_VERSION = 1;
const unsigned int ADAPTOR_MINOR_VERSION = 4;
-const unsigned int ADAPTOR_MICRO_VERSION = 4;
+const unsigned int ADAPTOR_MICRO_VERSION = 6;
const char * const ADAPTOR_BUILD_DATE = __DATE__ " " __TIME__;
#ifdef DEBUG_ENABLED
Name: dali-adaptor
Summary: The DALi Tizen Adaptor
-Version: 1.4.4
+Version: 1.4.6
Release: 1
Group: System/Libraries
License: Apache-2.0 and BSD-3-Clause and MIT
projects / platform / core / uifw / dali-adaptor.git / commitdiff