From 923bff4e1cd8afcf9e6157affa989384befd262a Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric.bail@free.fr>
Date: Fri, 24 Jun 2011 12:26:29 +0000
Subject: [PATCH] emotion: advertise native resolution.

SVN revision: 60664
---
 legacy/emotion/src/lib/emotion_smart.c                   | 1 +
 legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c | 3 ++-
 legacy/emotion/src/modules/gstreamer/emotion_sink.c      | 7 ++-----
 legacy/emotion/src/modules/xine/emotion_xine.c           | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c
index bdee730b32..f67ec10701 100644
--- a/legacy/emotion/src/lib/emotion_smart.c
+++ b/legacy/emotion/src/lib/emotion_smart.c
@@ -1180,6 +1180,7 @@ _emotion_frame_resize(Evas_Object *obj, int w, int h, double ratio)
 	changed = 1;
      }
    if (changed) evas_object_smart_callback_call(obj, SIG_FRAME_RESIZE, NULL);
+   evas_object_size_hint_request_set(obj, w, h);
 }
 
 EAPI void
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
index d48c4577ec..0c3f6fd24d 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
@@ -620,6 +620,7 @@ em_file_open(const char   *file,
 
        vstream = eina_list_data_get(ev->video_streams);
        ev->ratio = (double)vstream->width / (double)vstream->height;
+       _emotion_frame_resize(ev->obj, vstream->width, vstream->height, ev->ratio);
      }
 
    {
@@ -650,7 +651,7 @@ em_file_open(const char   *file,
      _free_metadata(ev->metadata);
    ev->metadata = calloc(1, sizeof(Emotion_Gstreamer_Metadata));
 
-  em_audio_channel_volume_set(ev, ev->volume);
+   em_audio_channel_volume_set(ev, ev->volume);
 
    _eos_timer_fct(ev);
    _emotion_open_done(ev->obj);
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_sink.c b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
index 572185ba58..54c3a66c3c 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_sink.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
@@ -508,11 +508,8 @@ static void evas_video_sink_render_handler(void *data,
    vstream->height = priv->height;
    ev->ratio = (double) priv->width / (double) priv->height;
 
-   if (vstream)
-     {
-        _emotion_video_pos_update(ev->obj, ev->position, vstream->length_time);
-        _emotion_frame_resize(ev->obj, vstream->width, vstream->height, ev->ratio);
-     }
+   _emotion_video_pos_update(ev->obj, ev->position, vstream->length_time);
+   _emotion_frame_resize(ev->obj, priv->width, priv->height, ev->ratio);
 
  exit_point:
    gst_buffer_unref(buffer);
diff --git a/legacy/emotion/src/modules/xine/emotion_xine.c b/legacy/emotion/src/modules/xine/emotion_xine.c
index 3738f6a273..de02e3b60b 100644
--- a/legacy/emotion/src/modules/xine/emotion_xine.c
+++ b/legacy/emotion/src/modules/xine/emotion_xine.c
@@ -1268,6 +1268,7 @@ _em_fd_ev_active(void *data __UNUSED__, Ecore_Fd_Handler *fdh)
                             ev->anim = NULL;
                          }
                        _emotion_open_done(ev->obj);
+		       _emotion_frame_resize(ev->obj, ev->w, ev->h, ev->ratio);
 		       break;
 		     case 3: /* shutdown done */
                        if (ev->anim)