X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fvideo-view%2Fvideo-view-impl.h;h=57641cdf42def1d7d377bd02dbbaf38d4e664e33;hp=be3ef81781b8f0527cd655bdd666b45fc351b6d1;hb=99e2ea03e6d6059f5803d700932df1ff1c848cd3;hpb=805ae527fca54726f894fb9936c288c7c0f7dbe7 diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.h b/dali-toolkit/internal/controls/video-view/video-view-impl.h index be3ef81..57641cd 100644 --- a/dali-toolkit/internal/controls/video-view/video-view-impl.h +++ b/dali-toolkit/internal/controls/video-view/video-view-impl.h @@ -1,5 +1,5 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_VIDEO_VIEW_H__ -#define __DALI_TOOLKIT_INTERNAL_VIDEO_VIEW_H__ +#ifndef DALI_TOOLKIT_INTERNAL_VIDEO_VIEW_H +#define DALI_TOOLKIT_INTERNAL_VIDEO_VIEW_H /* * Copyright (c) 2016 Samsung Electronics Co., Ltd. @@ -24,7 +24,7 @@ #include // INTERNAL INCLUDES -#include +#include #include #include @@ -179,7 +179,7 @@ public: /** * @brief Set the depth index of this image renderer * - * Renderer with higher depth indices are rendered in front of other renderers with smaller values + * Renderer with higher depth indices are rendered in front of other visuals with smaller values * @SINCE_1_1.38 * @param[in] depthIndex The depth index of this renderer */ @@ -240,7 +240,7 @@ private: Dali::VideoPlayer mVideoPlayer; Dali::ImageDimensions mVideoSize; - Toolkit::Visual mRenderer; + Toolkit::Visual::Base mVisual; Dali::Property::Map mPropertyMap; Dali::NativeImage mNativeImage; ///< Native image handle for video rendering by texture streaming Dali::Toolkit::VideoView::VideoViewSignalType mFinishedSignal; @@ -271,4 +271,4 @@ inline const Toolkit::Internal::VideoView& GetImpl( const Toolkit::VideoView& ha } // namespace Dali -#endif // __DALI_TOOLKIT_VIDEO_VIEW_H__ +#endif // DALI_TOOLKIT_VIDEO_VIEW_H