projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[4.0] Added an devel-API to check whether video texture is supported"
[platform/core/uifw/dali-adaptor.git]
/
adaptors
/
common
/
video-player-impl.cpp
diff --git
a/adaptors/common/video-player-impl.cpp
b/adaptors/common/video-player-impl.cpp
index
b87f091
..
50e3e6b
100644
(file)
--- a/
adaptors/common/video-player-impl.cpp
+++ b/
adaptors/common/video-player-impl.cpp
@@
-38,7
+38,12
@@
namespace Adaptor
namespace // unnamed namespace
{
namespace // unnamed namespace
{
+
+#if _GLIBCXX_USE_CXX11_ABI
const char* VIDEO_PLUGIN_SO( "libdali-video-player-plugin.so" );
const char* VIDEO_PLUGIN_SO( "libdali-video-player-plugin.so" );
+#else
+const char* VIDEO_PLUGIN_SO( "libdali-video-player-plugin-cxx03.so" );
+#endif
Dali::BaseHandle Create()
{
Dali::BaseHandle Create()
{
@@
-128,7
+133,7
@@
std::string VideoPlayer::GetUrl()
return mPlugin->GetUrl();
}
return mPlugin->GetUrl();
}
- return std::string(
NULL
);
+ return std::string();
}
void VideoPlayer::SetLooping(bool looping)
}
void VideoPlayer::SetLooping(bool looping)
@@
-232,6
+237,14
@@
int VideoPlayer::GetPlayPosition()
return 0;
}
return 0;
}
+void VideoPlayer::SetDisplayArea( DisplayArea area )
+{
+ if( mPlugin != NULL )
+ {
+ mPlugin->SetDisplayArea( area );
+ }
+}
+
void VideoPlayer::SetDisplayRotation( Dali::VideoPlayerPlugin::DisplayRotation rotation )
{
if( mPlugin != NULL )
void VideoPlayer::SetDisplayRotation( Dali::VideoPlayerPlugin::DisplayRotation rotation )
{
if( mPlugin != NULL )
@@
-260,6
+273,22
@@
Dali::VideoPlayerPlugin::VideoPlayerSignalType& VideoPlayer::FinishedSignal()
return mFinishedSignal;
}
return mFinishedSignal;
}
+void VideoPlayer::Forward( int millisecond )
+{
+ if( mPlugin != NULL )
+ {
+ mPlugin->Forward( millisecond );
+ }
+}
+
+void VideoPlayer::Backward( int millisecond )
+{
+ if( mPlugin != NULL )
+ {
+ mPlugin->Backward( millisecond );
+ }
+}
+
} // namespace Adaptor;
} // namespace Internal;
} // namespace Dali;
} // namespace Adaptor;
} // namespace Internal;
} // namespace Dali;