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
[dali_2.3.25] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
video-view
/
video-view-devel.cpp
diff --git
a/dali-toolkit/devel-api/controls/video-view/video-view-devel.cpp
b/dali-toolkit/devel-api/controls/video-view/video-view-devel.cpp
old mode 100755
(executable)
new mode 100644
(file)
index
41c6a30
..
f585013
--- a/
dali-toolkit/devel-api/controls/video-view/video-view-devel.cpp
+++ b/
dali-toolkit/devel-api/controls/video-view/video-view-devel.cpp
@@
-21,27
+21,24
@@
\r
namespace Dali
\r
{
\r
\r
namespace Dali
\r
{
\r
-
\r
namespace Toolkit
\r
{
\r
namespace Toolkit
\r
{
\r
-
\r
namespace DevelVideoView
\r
{
\r
namespace DevelVideoView
\r
{
\r
-
\r
-Any GetMediaPlayer( VideoView videoView )
\r
+Any GetMediaPlayer(VideoView videoView)
\r
{
\r
{
\r
- return Dali::Toolkit::GetImpl(
videoView
).GetMediaPlayer();
\r
+ return Dali::Toolkit::GetImpl(
videoView
).GetMediaPlayer();
\r
}
\r
\r
}
\r
\r
-VideoView New(
VideoSyncMode syncMode
)
\r
+VideoView New(
VideoSyncMode syncMode
)
\r
{
\r
{
\r
- VideoView videoView = Internal::VideoView::New(
syncMode
);
\r
+ VideoView videoView = Internal::VideoView::New(
syncMode
);
\r
return videoView;
\r
}
\r
\r
return videoView;
\r
}
\r
\r
-void PlayAnimation(
VideoView videoView, Animation animation
)
\r
+void PlayAnimation(
VideoView videoView, Animation animation
)
\r
{
\r
{
\r
- Dali::Toolkit::GetImpl(
videoView ).PlayAnimation( animation
);
\r
+ Dali::Toolkit::GetImpl(
videoView).PlayAnimation(animation
);
\r
}
\r
\r
} // namespace DevelVideoView
\r
}
\r
\r
} // namespace DevelVideoView
\r