Merge "Modify doxygen of display mode" into tizen

diff --git a/include/player_private.h b/include/player_private.h
index f4c247e..81e0069 100644 (file)
--- a/include/player_private.h
+++ b/include/player_private.h
@@ -134,6 +134,7 @@ typedef struct _player_s{
 int __player_convert_error_code(int code, char* func_name);
 bool __player_state_validate(player_s * handle, player_state_e threshold);
 int player_sound_register(player_h player, int pid);
+int player_is_streaming(player_h player, bool *is_streaming);
 
 /**
  * @brief Called when the video sink bin is crated.

diff --git a/src/player_priv.c b/src/player_priv.c
index ef66767..84a8f55 100644 (file)
--- a/src/player_priv.c
+++ b/src/player_priv.c
@@ -72,6 +72,7 @@ int player_set_display_wl_for_mused(player_h player, player_display_type_e type,
        void *set_handle = NULL;
        MMDisplaySurfaceType mmType = __player_mused_convet_display_type(type);
        MMDisplaySurfaceType mmClientType = MM_DISPLAY_SURFACE_NULL;
+       MMPlayerPipelineType mmPipelineType = MM_PLAYER_PIPELINE_SERVER;
 
        int ret;
        if (!__player_state_validate(handle, PLAYER_STATE_IDLE))
@@ -131,8 +132,9 @@ int player_set_display_wl_for_mused(player_h player, player_display_type_e type,
                ret = mm_player_set_attribute(handle->mm_handle, NULL,
                        "display_surface_type", mmType,
                        "display_surface_client_type", mmClientType,
-                       "display_overlay", set_handle,
-                       sizeof(void *), (char*)NULL);
+                       "display_overlay", set_handle, sizeof(void *),
+                       "pipeline_type", mmPipelineType,
+                       NULL);
 
                if (ret != MM_ERROR_NONE)
                {
@@ -261,8 +263,8 @@ int player_set_display_for_mused(player_h player, player_display_type_e type, un
        {
                ret = mm_player_set_attribute(handle->mm_handle, NULL,
                        "display_surface_type", mmType,
-                       "display_overlay", set_handle,
-                       sizeof(xhandle), (char*)NULL);
+                       "display_overlay", set_handle, sizeof(xhandle),
+                       NULL);
 
                if (ret != MM_ERROR_NONE)
                {
@@ -391,3 +393,14 @@ int player_sound_register(player_h player, int pid)
 
        return PLAYER_ERROR_NONE;
 }
+
+int player_is_streaming(player_h player, bool *is_streaming)
+{
+       PLAYER_INSTANCE_CHECK(player);
+       player_s * handle = (player_s *) player;
+
+       int ret = mm_player_is_streaming(handle->mm_handle, is_streaming);
+       if(ret != MM_ERROR_NONE)
+               return __player_convert_error_code(ret,(char*)__FUNCTION__);
+       return PLAYER_ERROR_NONE;
+}