Change-Id: I801ecf39ac089c4a57fc17b830e4d32bcf793e1f
Signed-off-by: Hyunho Kang <hhstark.kang@samsung.com>
dali-adaptor
dali-toolkit
cynara-client
dali-adaptor
dali-toolkit
cynara-client
- ecore-input
- tizen-remote-surface-client
+ ecore-input
+ tizen-remote-surface-client
+ screen_connector_watcher
#include <widget_instance.h>
#include <tzplatform_config.h>
#include <wayland-extension/tizen-extension-client-protocol.h>
#include <widget_instance.h>
#include <tzplatform_config.h>
#include <wayland-extension/tizen-extension-client-protocol.h>
-#include <aul_rsm_viewer.h>
DALI_TYPE_REGISTRATION_END()
DALI_TYPE_REGISTRATION_END()
-static void OnBufferUpdate( struct tizen_remote_surface* surface, wl_buffer* buffer, uint32_t time, void* data )
+static void OnBufferChanged( struct tizen_remote_surface *surface, uint32_t type, struct wl_buffer *buffer,
+ int32_t img_file_fd, uint32_t img_file_size, uint32_t time, struct wl_array *keys, void *data)
{
Dali::WidgetView::Internal::WidgetView* widgetView = static_cast< Dali::WidgetView::Internal::WidgetView* >( data );
{
Dali::WidgetView::Internal::WidgetView* widgetView = static_cast< Dali::WidgetView::Internal::WidgetView* >( data );
-static void OnSurfaceMissing( struct tizen_remote_surface* surface, void* data )
+static void OnBufferUpdated( struct tizen_remote_surface* surface, wl_buffer* buffer, uint32_t time, void* data )
{
Dali::WidgetView::Internal::WidgetView* widgetView = static_cast< Dali::WidgetView::Internal::WidgetView* >( data );
if( widgetView )
{
{
Dali::WidgetView::Internal::WidgetView* widgetView = static_cast< Dali::WidgetView::Internal::WidgetView* >( data );
if( widgetView )
{
- widgetView->CloseRemoteSurface();
+ if( !widgetView->IsWidgetImageView() )
+ {
+ tizen_remote_surface_transfer_visibility( surface, TIZEN_REMOTE_SURFACE_VISIBILITY_TYPE_VISIBLE);
+
+ widgetView->CreateWidgetImageView();
+ widgetView->ConnectSignal( surface );
+ }
+
+ //get tbm surface from buffer
+ tbm_surface_h tbmSurface = static_cast< tbm_surface_h >( wl_buffer_get_user_data( buffer ) );
+ widgetView->UpdateImageSource( tbmSurface );
+static void OnSurfaceMissing( struct tizen_remote_surface* surface, void* data )
+{
+ Dali::WidgetView::Internal::WidgetView* widgetView = static_cast< Dali::WidgetView::Internal::WidgetView* >( data );
-static struct aul_rsm_handler_s remoteSurfaceHandler = {
- OnBufferUpdate,
- OnSurfaceMissing,
-};
+ if( widgetView )
+ {
+ widgetView->CloseRemoteSurface();
+ }
+}
mPreviewVisible( true ),
mStateTextVisible( true ),
mPermanentDelete( false ),
mPreviewVisible( true ),
mStateTextVisible( true ),
mPermanentDelete( false ),
+ mWatcherHandle( NULL ),
mRemoteSurface( NULL )
{
}
mRemoteSurface( NULL )
{
}
mPreviewVisible( true ),
mStateTextVisible( true ),
mPermanentDelete( false ),
mPreviewVisible( true ),
mStateTextVisible( true ),
mPermanentDelete( false ),
+ mWatcherHandle( NULL ),
mRemoteSurface( NULL )
{
}
mRemoteSurface( NULL )
{
}
char* previewPath = NULL;
std::string previewImage;
widget_size_type_e sizeType;
char* previewPath = NULL;
std::string previewImage;
widget_size_type_e sizeType;
+ screen_connector_watcher_ops ops;
int ret = widget_instance_create( mWidgetId.c_str(), &instanceId );
if( ret < 0 || !instanceId )
int ret = widget_instance_create( mWidgetId.c_str(), &instanceId );
if( ret < 0 || !instanceId )
- aul_rsm_viewer_set_surface_handler( mInstanceId.c_str(), &remoteSurfaceHandler, this );
-
+ ops.change_cb = OnBufferChanged;
+ ops.missing_cb = OnSurfaceMissing;
+ ops.update_cb = OnBufferUpdated;
+ mWatcherHandle = screen_connector_watcher_add(&ops, (char *)mWidgetId.c_str(), this);
DALI_LOG_INFO( gWidgetViewLogging, Debug::Verbose, "WidgetView::OnInitialize: widget_instance_launch is called. [%s, mPid = %d]\n", mWidgetId.c_str(), mPid );
}
DALI_LOG_INFO( gWidgetViewLogging, Debug::Verbose, "WidgetView::OnInitialize: widget_instance_launch is called. [%s, mPid = %d]\n", mWidgetId.c_str(), mPid );
}
void WidgetView::CloseRemoteSurface()
{
void WidgetView::CloseRemoteSurface()
{
- aul_rsm_viewer_unset_surface_handler( mInstanceId.c_str() );
+ screen_connector_watcher_remove( mWatcherHandle );
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
#include <wayland-extension/tizen-remote-surface-client-protocol.h>
#include <tbm_surface.h>
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
#include <wayland-extension/tizen-remote-surface-client-protocol.h>
#include <tbm_surface.h>
+#include <screen_connector_watcher.h>
bool mPreviewVisible;
bool mStateTextVisible;
bool mPermanentDelete;
bool mPreviewVisible;
bool mStateTextVisible;
bool mPermanentDelete;
+ screen_connector_watcher_h mWatcherHandle;
tizen_remote_surface* mRemoteSurface;
// Signals
tizen_remote_surface* mRemoteSurface;
// Signals
#include <unistd.h>
#include <widget_errno.h>
#include <widget_instance.h>
#include <unistd.h>
#include <widget_errno.h>
#include <widget_instance.h>
-#include <aul_rsm_viewer.h>
+#include <screen_connector_watcher.h>
WidgetViewManager::~WidgetViewManager()
{
WidgetViewManager::~WidgetViewManager()
{
+ screen_connector_watcher_fini();
widget_instance_unlisten_event( WidgetViewManager::WidgetEventCallback );
widget_instance_fini();
}
widget_instance_unlisten_event( WidgetViewManager::WidgetEventCallback );
widget_instance_fini();
}
}
// Binds tizen remote surface manager & connects callback
}
// Binds tizen remote surface manager & connects callback
- if( aul_rsm_viewer_init() < 0 )
+ if( screen_connector_watcher_init() < 0 )
{
return WIDGET_ERROR_FAULT;
}
{
return WIDGET_ERROR_FAULT;
}