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
Merge "ImageView example code correction" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-video-player.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.cpp
index
05e66d8
..
e7fb2cf
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.cpp
@@
-15,11
+15,10
@@
*
*/
*
*/
-// CLASS HEADER
-#include "toolkit-video-player.h"
-
-// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/video-player.h>
#include <dali/public-api/object/any.h>
#include <dali/public-api/object/any.h>
+#include <dali/public-api/object/base-object.h>
+#include <toolkit-application.h>
namespace Dali
{
namespace Dali
{
@@
-60,6
+59,14
@@
public:
return mLooping;
}
return mLooping;
}
+ void Stop()
+ {
+ if( !mFinishedSignal.Empty() )
+ {
+ mFinishedSignal.Emit();
+ }
+ }
+
public:
std::string mUrl;
public:
std::string mUrl;
@@
-163,6
+170,7
@@
void VideoPlayer::Pause()
void VideoPlayer::Stop()
{
void VideoPlayer::Stop()
{
+ Internal::Adaptor::GetImplementation( *this ).Stop();
}
void VideoPlayer::SetMute( bool mute )
}
void VideoPlayer::SetMute( bool mute )
@@
-200,6
+208,10
@@
int VideoPlayer::GetPlayPosition()
return 0;
}
return 0;
}
+void VideoPlayer::SetDisplayArea( DisplayArea area )
+{
+}
+
void VideoPlayer::SetDisplayRotation( Dali::VideoPlayerPlugin::DisplayRotation rotation )
{
}
void VideoPlayer::SetDisplayRotation( Dali::VideoPlayerPlugin::DisplayRotation rotation )
{
}
@@
-214,5
+226,18
@@
Dali::VideoPlayerPlugin::VideoPlayerSignalType& VideoPlayer::FinishedSignal()
return Internal::Adaptor::GetImplementation( *this ).mFinishedSignal;
}
return Internal::Adaptor::GetImplementation( *this ).mFinishedSignal;
}
+void VideoPlayer::Forward( int millisecond )
+{
+}
+
+void VideoPlayer::Backward( int millisecond )
+{
+}
+
+bool VideoPlayer::IsVideoTextureSupported() const
+{
+ return ToolkitApplication::DECODED_IMAGES_SUPPORTED;
+}
+
} // namespace Dali;
} // namespace Dali;