VideoPlayer();
- virtual ~VideoPlayer();
+ ~VideoPlayer();
static VideoPlayer New();
} // namespace Dali;
#endif
-
END_TEST;
}
+// Positive test case for a method
+int UtcDaliVideoViewProperty1b(void)
+{
+ ToolkitTestApplication application;
+ tet_infoline(" UtcDaliVideoViewProperty1");
+
+ Toolkit::VideoView view = Toolkit::VideoView::New();
+ DALI_TEST_CHECK( view );
+
+ std::string file;
+ Property::Map map;
+
+ view.SetProperty( VideoView::Property::VIDEO, Property::Map()
+ .Add("rendererType", "IMAGE")
+ .Add("url", "video.mpg") // Note, videoView doesn't use this url
+ .Add("RENDERER_TARGET", "windowSurfaceTarget" )
+ .Add("width", 100)
+ .Add("height", 100) );
+
+ Property::Value val = view.GetProperty( VideoView::Property::VIDEO );
+ Property::Map* resultMap = val.GetMap();
+
+ DALI_TEST_CHECK( resultMap );
+ Property::Value* value = resultMap->Find("url");
+ DALI_TEST_CHECK( value );
+ DALI_TEST_EQUALS( value->Get<std::string>(), "video.mpg", TEST_LOCATION );
+
+ END_TEST;
+}
+
int UtcDaliVideoViewProperty2(void)
{
ToolkitTestApplication application;
};
-
-/**
- * @brief Template to allow discard old visual, get new one and set it on stage if possible
- *
- * @tparam ParameterType0 The type of first argument passed to the CreateVisual()
- * @tparam ParameterType1 The type of second argument passed to the CreateVisual()
- * @SINCE_1_0.39
- * @param[in] actor Actor for which the visual will be replaced
- * @param[in,out] visual The visual to be replaced
- * @param[in] param0 First template based argument passed to the visual factory
- * @param[in] param1 Second template based argument passed to the visual factory
- */
-template< class ParameterType0, class ParameterType1 >
-void InitializeVisual( Actor& actor, Visual::Base& visual, ParameterType0& param0, ParameterType1& param1 )
-{
- visual.RemoveAndReset( actor );
- visual = Toolkit::VisualFactory::Get().CreateVisual( param0, param1 );
- if( visual && actor && actor.OnStage() )
- {
- visual.SetOnStage( actor );
- }
-}
-
-/**
- * @brief Template to allow discard old visual, get new one and set it on stage if possible
- *
- * @tparam ParameterType The type of argument passed to the CreateVisual()
- * @SINCE_1_0.39
- * @param[in] actor Actor for which the visual will be replaced
- * @param[in,out] visual The visual to be replaced
- * @param[in] param Template based argument passed to the visual factory
- */
-template< class ParameterType >
-void InitializeVisual( Actor& actor, Visual::Base& visual, ParameterType& param )
-{
- visual.RemoveAndReset( actor );
- visual = Toolkit::VisualFactory::Get().CreateVisual( param );
- if( visual && actor && actor.OnStage() )
- {
- visual.SetOnStage( actor );
- }
-}
-
} // namespace Toolkit
} // namespace Dali
#include <dali-toolkit/internal/filters/emboss-filter.h>
#include <dali-toolkit/internal/filters/spread-filter.h>
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
namespace Dali
{
FrameBufferImage dummyImage = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat );
- InitializeVisual( self, mVisualPostFilter, dummyImage );
+ Internal::InitializeVisual( self, mVisualPostFilter, dummyImage );
Property::Map customShader;
customShader[ Toolkit::Visual::Shader::Property::VERTEX_SHADER ] = EFFECTS_VIEW_VERTEX_SOURCE;
customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = EFFECTS_VIEW_FRAGMENT_SOURCE;
Actor self( Self() );
mImageForChildren = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat );
- InitializeVisual( self, mVisualForChildren, mImageForChildren );
+ Internal::InitializeVisual( self, mVisualForChildren, mImageForChildren );
mVisualForChildren.SetDepthIndex( DepthIndex::CONTENT+1 );
mImagePostFilter = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat );
// INTERNAL_INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
namespace //Unnamed namespace
{
mInputImage = inputImage;
Actor self( Self() );
- InitializeVisual( self, mVisuals[0], mInputImage );
+ Internal::InitializeVisual( self, mVisuals[0], mInputImage );
mVisuals[0].SetDepthIndex(0);
SetShaderEffect( mVisuals[0] );
if( self.OnStage() )
float exponent = static_cast<float>(i);
mBlurredImage[i-1] = FrameBufferImage::New( mTargetSize.width/std::pow(2.f,exponent) , mTargetSize.height/std::pow(2.f,exponent),
GAUSSIAN_BLUR_RENDER_TARGET_PIXEL_FORMAT );
- InitializeVisual( self, mVisuals[i], mBlurredImage[i - 1] );
+ Internal::InitializeVisual( self, mVisuals[i], mBlurredImage[i - 1] );
mVisuals[ i ].SetDepthIndex( i );
SetShaderEffect( mVisuals[ i ] );
}
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/video-view/video-view.h>
+#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
namespace Dali
{
mPropertyMap = map;
Actor self( Self() );
- InitializeVisual( self, mVisual, mPropertyMap );
+ Internal::InitializeVisual( self, mVisual, mPropertyMap );
Property::Value* widthValue = mPropertyMap.Find( "width" );
if( widthValue )
mVideoPlayer.SetUrl( mUrl );
mVideoPlayer.FinishedSignal().Connect( this, &VideoView::EmitSignalFinish );
- InitializeVisual( self, mVisual, mNativeImage );
+ Internal::InitializeVisual( self, mVisual, mNativeImage );
if( mIsPlay )
{
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
#include <dali-toolkit/devel-api/visual-factory/devel-visual-properties.h>
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
namespace Dali
{
mRootActor.Add( mActorForComposite );
- InitializeVisual( mActorForComposite, mVisualForEmboss1, mImageForEmboss1 );
+ Internal::InitializeVisual( mActorForComposite, mVisualForEmboss1, mImageForEmboss1 );
Toolkit::GetImplementation( mVisualForEmboss1 ).SetCustomShader( customShader );
mActorForComposite.GetRendererAt(0).RegisterProperty( COLOR_UNIFORM_NAME, Color::BLACK );
- InitializeVisual( mActorForComposite, mVisualForEmboss2, mImageForEmboss2 );
+ Internal::InitializeVisual( mActorForComposite, mVisualForEmboss2, mImageForEmboss2 );
Toolkit::GetImplementation( mVisualForEmboss2 ).SetCustomShader( customShader );
mActorForComposite.GetRendererAt(1).RegisterProperty( COLOR_UNIFORM_NAME, Color::WHITE );
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
#include <dali-toolkit/devel-api/visual-factory/visual-base.h>
+#include <dali-toolkit/internal/visuals/visual-base-impl.h>
namespace Dali
{
bool mDebugEnabled;
};
+/**
+ * @brief Template to allow discard old visual, get new one and set it on stage if possible
+ *
+ * @tparam ParameterType0 The type of first argument passed to the CreateVisual()
+ * @tparam ParameterType1 The type of second argument passed to the CreateVisual()
+ * @SINCE_1_0.39
+ * @param[in] actor Actor for which the visual will be replaced
+ * @param[in,out] visual The visual to be replaced
+ * @param[in] param0 First template based argument passed to the visual factory
+ * @param[in] param1 Second template based argument passed to the visual factory
+ */
+template< class ParameterType0, class ParameterType1 >
+void InitializeVisual( Actor& actor, Toolkit::Visual::Base& visual, ParameterType0& param0, ParameterType1& param1 )
+{
+ visual.RemoveAndReset( actor );
+ visual = Toolkit::VisualFactory::Get().CreateVisual( param0, param1 );
+ if( visual && actor && actor.OnStage() )
+ {
+ Toolkit::GetImplementation(visual).SetOnStage(actor);
+ }
+}
+
+/**
+ * @brief Template to allow discard old visual, get new one and set it on stage if possible
+ *
+ * @tparam ParameterType The type of argument passed to the CreateVisual()
+ * @SINCE_1_0.39
+ * @param[in] actor Actor for which the visual will be replaced
+ * @param[in,out] visual The visual to be replaced
+ * @param[in] param Template based argument passed to the visual factory
+ */
+template< class ParameterType >
+void InitializeVisual( Actor& actor, Toolkit::Visual::Base& visual, ParameterType& param )
+{
+ visual.RemoveAndReset( actor );
+ visual = Toolkit::VisualFactory::Get().CreateVisual( param );
+ if( visual && actor && actor.OnStage() )
+ {
+ Toolkit::GetImplementation(visual).SetOnStage(actor);
+ }
+}
+
} // namespace Internal
inline const Internal::VisualFactory& GetImplementation(const Toolkit::VisualFactory& factory)