projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding Visual namespace and Visual becomes Visual::Base
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
video-view
/
video-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
index
671ebb7
..
692048d
100644
(file)
--- a/
dali-toolkit/internal/controls/video-view/video-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/video-view/video-view-impl.cpp
@@
-120,7
+120,7
@@
void VideoView::SetPropertyMap( Property::Map map )
mPropertyMap = map;
Actor self( Self() );
mPropertyMap = map;
Actor self( Self() );
- InitializeVisual( self, m
Renderer
, mPropertyMap );
+ InitializeVisual( self, m
Visual
, mPropertyMap );
Property::Value* widthValue = mPropertyMap.Find( "width" );
if( widthValue )
Property::Value* widthValue = mPropertyMap.Find( "width" );
if( widthValue )
@@
-430,9
+430,9
@@
Property::Value VideoView::GetProperty( BaseObject* object, Property::Index prop
void VideoView::SetDepthIndex( int depthIndex )
{
void VideoView::SetDepthIndex( int depthIndex )
{
- if( m
Renderer
)
+ if( m
Visual
)
{
{
- m
Renderer
.SetDepthIndex( depthIndex );
+ m
Visual
.SetDepthIndex( depthIndex );
}
}
}
}
@@
-440,19
+440,19
@@
void VideoView::OnStageConnection( int depth )
{
Control::OnStageConnection( depth );
{
Control::OnStageConnection( depth );
- if( m
Renderer
)
+ if( m
Visual
)
{
CustomActor self = Self();
{
CustomActor self = Self();
- m
Renderer
.SetOnStage( self );
+ m
Visual
.SetOnStage( self );
}
}
void VideoView::OnStageDisconnection()
{
}
}
void VideoView::OnStageDisconnection()
{
- if( m
Renderer
)
+ if( m
Visual
)
{
CustomActor self = Self();
{
CustomActor self = Self();
- m
Renderer
.SetOffStage( self );
+ m
Visual
.SetOffStage( self );
}
Control::OnStageDisconnection();
}
Control::OnStageDisconnection();
@@
-505,7
+505,7
@@
void VideoView::SetWindowSurfaceTarget()
int curPos = mVideoPlayer.GetPlayPosition();
mSetRenderingTarget = true;
int curPos = mVideoPlayer.GetPlayPosition();
mSetRenderingTarget = true;
- m
Renderer
.RemoveAndReset( self );
+ m
Visual
.RemoveAndReset( self );
mVideoPlayer.SetRenderingTarget( Dali::Adaptor::Get().GetNativeWindowHandle() );
mVideoPlayer.SetUrl( mUrl );
mVideoPlayer.SetRenderingTarget( Dali::Adaptor::Get().GetNativeWindowHandle() );
mVideoPlayer.SetUrl( mUrl );
@@
-538,7
+538,7
@@
void VideoView::SetNativeImageTarget()
mVideoPlayer.SetUrl( mUrl );
mVideoPlayer.FinishedSignal().Connect( this, &VideoView::EmitSignalFinish );
mVideoPlayer.SetUrl( mUrl );
mVideoPlayer.FinishedSignal().Connect( this, &VideoView::EmitSignalFinish );
- InitializeVisual( self, m
Renderer
, mNativeImage );
+ InitializeVisual( self, m
Visual
, mNativeImage );
if( mIsPlay )
{
if( mIsPlay )
{