left = right = 0.f;
Property::Map map;
- map.Insert( VOLUME_LEFT, 1.0f );
+ map.Insert( VOLUME_LEFT, 0.5f );
map.Insert( VOLUME_RIGHT, 0.5f );
- Property::Map map2;
view.SetProperty( VideoView::Property::VOLUME, map );
- Property::Value val4 = view.GetProperty( VideoView::Property::VOLUME );
- DALI_TEST_CHECK( val4.Get( map2 ) );
+ Property::Value val = view.GetProperty( VideoView::Property::VOLUME );
+
+ Property::Map map2;
+ DALI_TEST_CHECK( val.Get( map2 ) );
- Property::Value* volumeLeft = map.Find( VOLUME_LEFT );
- Property::Value* volumeRight = map.Find( VOLUME_RIGHT );
+ Property::Value* volumeLeft = map2.Find( VOLUME_LEFT );
+ Property::Value* volumeRight = map2.Find( VOLUME_RIGHT );
DALI_TEST_CHECK( volumeLeft && volumeLeft->Get( left ) );
DALI_TEST_CHECK( volumeRight && volumeRight->Get( right ) );
- DALI_TEST_CHECK( left == 1.0f );
+ DALI_TEST_CHECK( left == 0.5f );
DALI_TEST_CHECK( right == 0.5f );
END_TEST;
const char* const VOLUME_LEFT( "volumeLeft" );
const char* const VOLUME_RIGHT( "volumeRight" );
-const char* const RENDERING_TARGET( "RENDERING_TARGET" );
+const char* const RENDERING_TARGET( "renderingTarget" );
const char* const WINDOW_SURFACE_TARGET( "windowSurfaceTarget" );
const char* const NATIVE_IMAGE_TARGET( "nativeImageTarget" );
VideoView::VideoView()
: Control( ControlBehaviour( ACTOR_BEHAVIOUR_DEFAULT | DISABLE_STYLE_CHANGE_SIGNALS ) ),
mCurrentVideoPlayPosition( 0 ),
- mSetRenderingTarget( false ),
+ mIsNativeImageTarget( true ),
mIsPlay( false ),
mIsPause( false )
{
return handle;
}
+void VideoView::OnInitialize()
+{
+ Any source;
+ Dali::NativeImageSourcePtr nativeImageSourcePtr = Dali::NativeImageSource::New( source );
+ mNativeImage = Dali::NativeImage::New( *nativeImageSourcePtr );
+
+ mVideoPlayer.SetRenderingTarget( nativeImageSourcePtr );
+ mVideoPlayer.FinishedSignal().Connect( this, &VideoView::EmitSignalFinish );
+}
+
void VideoView::SetUrl( const std::string& url )
{
if( mUrl != url || !mPropertyMap.Empty() )
{
- mPropertyMap.Clear();
-
mUrl = url;
+ mPropertyMap.Clear();
}
- if( mSetRenderingTarget )
+ if( mIsNativeImageTarget )
{
- mVideoPlayer.SetUrl( mUrl );
- }
- else
- {
- SetNativeImageTarget();
+ Actor self( Self() );
+ InitializeVisual( self, mVisual, mNativeImage );
}
+
+ mVideoPlayer.SetUrl( mUrl );
}
void VideoView::SetPropertyMap( Property::Map map )
Actor self = Self();
int curPos = mVideoPlayer.GetPlayPosition();
- mSetRenderingTarget = true;
- mVisual.RemoveAndReset( self );
+ if( mVisual )
+ {
+ Toolkit::GetImplementation(mVisual).SetOffStage(self);
+ mVisual.Reset();
+ }
mVideoPlayer.SetRenderingTarget( Dali::Adaptor::Get().GetNativeWindowHandle() );
mVideoPlayer.SetUrl( mUrl );
- mVideoPlayer.FinishedSignal().Connect( this, &VideoView::EmitSignalFinish );
+
+ mIsNativeImageTarget = false;
if( mIsPlay )
{
Actor self( Self() );
int curPos = mVideoPlayer.GetPlayPosition();
- mSetRenderingTarget = true;
-
Any source;
Dali::NativeImageSourcePtr nativeImageSourcePtr = Dali::NativeImageSource::New( source );
mNativeImage = Dali::NativeImage::New( *nativeImageSourcePtr );
mVideoPlayer.SetRenderingTarget( nativeImageSourcePtr );
mVideoPlayer.SetUrl( mUrl );
- mVideoPlayer.FinishedSignal().Connect( this, &VideoView::EmitSignalFinish );
InitializeVisual( self, mVisual, mNativeImage );
+ mIsNativeImageTarget = true;
if( mIsPlay )
{
*/
void SetDepthIndex( int depthIndex );
-
/**
* @brief Performs actions as requested using the action name.
* @SINCE_1_1.38
private: // From Control
/**
+ * @copydoc Toolkit::Control::OnInitialize()
+ */
+ virtual void OnInitialize();
+
+ /**
* @copydoc Toolkit::Control::OnStageConnect()
*/
virtual void OnStageConnection( int depth );
Dali::Toolkit::VideoView::VideoViewSignalType mFinishedSignal;
std::string mUrl;
int mCurrentVideoPlayPosition;
- bool mSetRenderingTarget;
+ bool mIsNativeImageTarget;
bool mIsPlay;
bool mIsPause;
};