diff options
author | Cedric BAIL <cedric.bail@free.fr> | 2011-06-24 12:26:29 +0000 |
---|---|---|
committer | Cedric BAIL <cedric.bail@free.fr> | 2011-06-24 12:26:29 +0000 |
commit | 923bff4e1cd8afcf9e6157affa989384befd262a (patch) | |
tree | 97e835b737518707070e283c98592724b1d09dcc /legacy/emotion/src | |
parent | dadaf6f420f202481d1f47061d41a6a47705f721 (diff) |
emotion: advertise native resolution.
SVN revision: 60664
Diffstat (limited to '')
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) | |||
1180 | changed = 1; | 1180 | changed = 1; |
1181 | } | 1181 | } |
1182 | if (changed) evas_object_smart_callback_call(obj, SIG_FRAME_RESIZE, NULL); | 1182 | if (changed) evas_object_smart_callback_call(obj, SIG_FRAME_RESIZE, NULL); |
1183 | evas_object_size_hint_request_set(obj, w, h); | ||
1183 | } | 1184 | } |
1184 | 1185 | ||
1185 | EAPI void | 1186 | 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, | |||
620 | 620 | ||
621 | vstream = eina_list_data_get(ev->video_streams); | 621 | vstream = eina_list_data_get(ev->video_streams); |
622 | ev->ratio = (double)vstream->width / (double)vstream->height; | 622 | ev->ratio = (double)vstream->width / (double)vstream->height; |
623 | _emotion_frame_resize(ev->obj, vstream->width, vstream->height, ev->ratio); | ||
623 | } | 624 | } |
624 | 625 | ||
625 | { | 626 | { |
@@ -650,7 +651,7 @@ em_file_open(const char *file, | |||
650 | _free_metadata(ev->metadata); | 651 | _free_metadata(ev->metadata); |
651 | ev->metadata = calloc(1, sizeof(Emotion_Gstreamer_Metadata)); | 652 | ev->metadata = calloc(1, sizeof(Emotion_Gstreamer_Metadata)); |
652 | 653 | ||
653 | em_audio_channel_volume_set(ev, ev->volume); | 654 | em_audio_channel_volume_set(ev, ev->volume); |
654 | 655 | ||
655 | _eos_timer_fct(ev); | 656 | _eos_timer_fct(ev); |
656 | _emotion_open_done(ev->obj); | 657 | _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, | |||
508 | vstream->height = priv->height; | 508 | vstream->height = priv->height; |
509 | ev->ratio = (double) priv->width / (double) priv->height; | 509 | ev->ratio = (double) priv->width / (double) priv->height; |
510 | 510 | ||
511 | if (vstream) | 511 | _emotion_video_pos_update(ev->obj, ev->position, vstream->length_time); |
512 | { | 512 | _emotion_frame_resize(ev->obj, priv->width, priv->height, ev->ratio); |
513 | _emotion_video_pos_update(ev->obj, ev->position, vstream->length_time); | ||
514 | _emotion_frame_resize(ev->obj, vstream->width, vstream->height, ev->ratio); | ||
515 | } | ||
516 | 513 | ||
517 | exit_point: | 514 | exit_point: |
518 | gst_buffer_unref(buffer); | 515 | 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) | |||
1268 | ev->anim = NULL; | 1268 | ev->anim = NULL; |
1269 | } | 1269 | } |
1270 | _emotion_open_done(ev->obj); | 1270 | _emotion_open_done(ev->obj); |
1271 | _emotion_frame_resize(ev->obj, ev->w, ev->h, ev->ratio); | ||
1271 | break; | 1272 | break; |
1272 | case 3: /* shutdown done */ | 1273 | case 3: /* shutdown done */ |
1273 | if (ev->anim) | 1274 | if (ev->anim) |