Merge "Fix sync issue about window rotation" into devel/master

[platform/core/uifw/dali-adaptor.git] / dali / devel-api / adaptor-framework / video-player.h

diff --git a/dali/devel-api/adaptor-framework/video-player.h b/dali/devel-api/adaptor-framework/video-player.h
index 2186250..6db7304 100755 (executable)
--- a/dali/devel-api/adaptor-framework/video-player.h
+++ b/dali/devel-api/adaptor-framework/video-player.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_VIDEO_PLAYER_H__
-#define __DALI_VIDEO_PLAYER_H__
+#ifndef DALI_VIDEO_PLAYER_H
+#define DALI_VIDEO_PLAYER_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 
 //INTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/video-player-plugin.h>
+#include <dali/public-api/dali-adaptor-common.h>
 
 namespace Dali
 {
@@ -43,7 +44,7 @@ namespace Adaptor
  * @brief VideoPlayer class is used for video playback.
  * @SINCE_1_1.38
  */
-class DALI_IMPORT_API VideoPlayer: public BaseHandle
+class DALI_ADAPTOR_API VideoPlayer: public BaseHandle
 {
 public:
 
@@ -271,6 +272,12 @@ public:
    */
   Dali::VideoPlayerPlugin::DisplayMode::Type GetDisplayMode() const;
 
+  /**
+   * @brief Gets the media player of video player
+   * @return player The media player
+   */
+  Any GetMediaPlayer();
+
 private: // Not intended for application developers
 
   /**
@@ -282,5 +289,4 @@ private: // Not intended for application developers
 
 } // namespace Dali;
 
-#endif
-
+#endif // DALI_VIDEO_PLAYER_H