Revert "Modified video view impl by considering visual"

One patch was merged by wrong way, so reverted

This reverts commit 79a69ab0b206ee0464a624077062e72f437bad98.

Change-Id: Ib3d55a0b23caf4040e5b3c3aa7640ea9e62a336e

diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
index 0dd7e1c..1fd4be5 100644 (file)
--- a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
+++ b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
@@ -29,10 +29,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/video-view/video-view.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/video-view/video-view.h>

-#include <dali-toolkit/public-api/visuals/visual-properties.h>
-#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
-#include <dali-toolkit/internal/visuals/visual-string-constants.h>
-#include <dali-toolkit/internal/visuals/visual-base-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-impl.h>

 
 namespace Dali
 {
 
 namespace Dali
 {


@@ -154,18 +151,6 @@ void VideoView::SetPropertyMap( Property::Map map )
     }
   }
 
     }
   }
 

-  Property::Value* target = map.Find( RENDERING_TARGET );
-  std::string targetType;
-
-  if( target && target->Get( targetType ) && targetType == WINDOW_SURFACE_TARGET )
-  {
-    this->SetWindowSurfaceTarget();
-  }
-  else if( target && target->Get( targetType ) && targetType == NATIVE_IMAGE_TARGET )
-  {
-    this->SetNativeImageTarget();
-  }
-

   RelayoutRequest();
 }
 
   RelayoutRequest();
 }
 


@@ -342,33 +327,25 @@ void VideoView::SetProperty( BaseObject* object, Property::Index index, const Pr
       case Toolkit::VideoView::Property::VIDEO:
       {
         std::string videoUrl;
       case Toolkit::VideoView::Property::VIDEO:
       {
         std::string videoUrl;

-        Property::Map map;
-

         if( value.Get( videoUrl ) )
         {
           impl.SetUrl( videoUrl );
         }
         if( value.Get( videoUrl ) )
         {
           impl.SetUrl( videoUrl );
         }

-        else if( value.Get( map ) )
+
+        Property::Map map;
+        if( value.Get( map ) )

         {
         {

-          Property::Value* shaderValue = map.Find( Toolkit::Visual::Property::SHADER, CUSTOM_SHADER );
+          impl.SetPropertyMap( map );

 
 

-          if( map.Count() > 1u || !shaderValue )
+          Property::Value* target = map.Find( RENDERING_TARGET );
+          std::string targetType;
+          if( target && target->Get( targetType ) && targetType == WINDOW_SURFACE_TARGET )

           {
           {

-            impl.SetPropertyMap( map );
+            impl.SetWindowSurfaceTarget();

           }
           }

-          else if( impl.mVisual && map.Count() == 1u && shaderValue )
+          else if( target && target->Get( targetType ) && targetType == NATIVE_IMAGE_TARGET )

           {
           {

-            Property::Map shaderMap;
-            if( shaderValue->Get( shaderMap ) )
-            {
-              Internal::Visual::Base& visual = Toolkit::GetImplementation( impl.mVisual );
-              visual.SetCustomShader( shaderMap );
-              if( videoView.OnStage() )
-              {
-                visual.SetOffStage( videoView );
-                visual.SetOnStage( videoView );
-              }
-            }
+            impl.SetNativeImageTarget();

           }
         }
         break;
           }
         }
         break;