[EGIT] [core/efl] master 01/01: index: Avoid SIGSEV in elm_index_item_sorted_insert
hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5f87f5f67327f4ae5a6404b421a97a71e2a40762 commit 5f87f5f67327f4ae5a6404b421a97a71e2a40762 Author: Yeshwanth Reddivari Date: Wed May 18 18:31:48 2016 +0900 index: Avoid SIGSEV in elm_index_item_sorted_insert Summary: Avoid SIGSEV in elm_index_item_sorted_insert when cmp_data_func returns >=0 After deleting eo_item and making it NULL in above case, view(it) is created which resulted in crash. Test Plan: elementary_test -to 'index 2' Reviewers: singh.amitesh, jpeg, cedric, raster, Hermet Reviewed By: Hermet Subscribers: Hermet Differential Revision: https://phab.enlightenment.org/D3956 --- src/lib/elementary/elm_index.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index c6cf6b3..5e8e1de 100644 --- a/src/lib/elementary/elm_index.c +++ b/src/lib/elementary/elm_index.c @@ -1490,7 +1490,7 @@ _elm_index_item_sorted_insert(Eo *obj, Elm_Index_Data *sd, const char *letter, E if (cmp_data_func(WIDGET_ITEM_DATA_GET(eo_p_it), item_data) >= 0) WIDGET_ITEM_DATA_SET(eo_p_it, item_data); elm_wdg_item_del(eo_item); - eo_item = NULL; + return NULL; } } ELM_INDEX_ITEM_DATA_GET(eo_item, it); --
[EGIT] [core/efl] master 01/01: Index : Use orientation interface APIs instead of horizontal set/get APIs
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=26316058f04663f6d5b8eb96cfd4dc6e2b9a5579
commit 26316058f04663f6d5b8eb96cfd4dc6e2b9a5579
Author: Yeshwanth Reddivari
Date: Wed May 18 18:33:53 2016 +0900
Index : Use orientation interface APIs instead of horizontal set/get APIs
Test Plan: elementary_test
Reviewers: singh.amitesh, jpeg, cedric, raster, Hermet
Subscribers: Hermet
Differential Revision: https://phab.enlightenment.org/D3954
---
src/bin/elementary/test_index.c | 4 +--
src/lib/elementary/elm_index.c| 55 ++-
src/lib/elementary/elm_index.eo | 22 ++
src/lib/elementary/elm_index_legacy.h | 32
src/lib/elementary/elm_widget_index.h | 2 +-
5 files changed, 80 insertions(+), 35 deletions(-)
diff --git a/src/bin/elementary/test_index.c b/src/bin/elementary/test_index.c
index 085f849..141c808 100644
--- a/src/bin/elementary/test_index.c
+++ b/src/bin/elementary/test_index.c
@@ -82,7 +82,7 @@ set_api_state(api_data *api)
break;
case INDEX_HORIZONTAL:
- elm_index_horizontal_set(d->id, EINA_TRUE);
+ efl_orientation_set(d->id, EFL_ORIENT_HORIZONTAL);
break;
case INDEX_INDICATOR_DISABLED:
@@ -564,7 +564,7 @@ test_index_horizontal(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED,
evas_object_show(list);
api->dt.id = id = elm_index_add(win);
- elm_index_horizontal_set(id, EINA_TRUE);
+ efl_orientation_set(id, EFL_ORIENT_HORIZONTAL);
evas_object_size_hint_weight_set(id, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(id, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_table_pack(tb, id, 0, 0, 1, 1);
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index 5e8e1de..4e75435 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -59,8 +59,14 @@ _box_custom_layout(Evas_Object *o,
void *data)
{
Elm_Index_Data *sd = data;
+ Eina_Bool horizontal;
- _els_box_layout(o, priv, sd->horizontal, EINA_TRUE, EINA_FALSE);
+ if (sd->orientation == EFL_ORIENT_HORIZONTAL)
+ horizontal = EINA_TRUE;
+ else
+ horizontal = EINA_FALSE;
+
+ _els_box_layout(o, priv, horizontal, EINA_TRUE, EINA_FALSE);
}
static void
@@ -320,7 +326,7 @@ _index_box_auto_fill(Evas_Object *obj,
edje_object_mirrored_set(VIEW(it), rtl);
o = VIEW(it);
-if (sd->horizontal)
+if (sd->orientation == EFL_ORIENT_HORIZONTAL)
{
if (i & 0x1)
elm_widget_theme_object_set
@@ -433,7 +439,7 @@ _elm_index_elm_widget_theme_apply(Eo *obj, Elm_Index_Data
*sd)
_index_box_clear(obj, 0);
_index_box_clear(obj, 1);
- if (sd->horizontal)
+ if (sd->orientation == EFL_ORIENT_HORIZONTAL)
eina_stringshare_replace(&ld->group, "base/horizontal");
else
eina_stringshare_replace(&ld->group, "base/vertical");
@@ -650,7 +656,7 @@ _sel_eval(Evas_Object *obj,
x = (x * x) + (y * y);
if ((x < dist) || (!it_closest))
{
- if (sd->horizontal)
+ if (sd->orientation == EFL_ORIENT_HORIZONTAL)
cdv = (double)(xx - bx) / (double)bw;
else
cdv = (double)(yy - by) / (double)bh;
@@ -889,7 +895,7 @@ _on_mouse_move(void *data,
(wd->resize_obj, "elm.dragable.pointer",
(!edje_object_mirrored_get(wd->resize_obj)) ?
x : (x - w), y);
- if (!sd->horizontal)
+ if (sd->orientation == EFL_ORIENT_VERTICAL)
{
if (adx > minw)
{
@@ -1225,6 +1231,28 @@ elm_index_add(Evas_Object *parent)
return obj;
}
+EAPI void elm_index_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
+{
+ Efl_Orient orient;
+
+ if (horizontal)
+ orient = EFL_ORIENT_HORIZONTAL;
+ else
+ orient = EFL_ORIENT_VERTICAL;
+
+ efl_orientation_set(obj, orient);
+}
+
+EAPI Eina_Bool elm_index_horizontal_get(const Evas_Object *obj)
+{
+ Efl_Orient orient = efl_orientation_get(obj);
+
+ if (orient == EFL_ORIENT_HORIZONTAL)
+ return EINA_TRUE;
+
+ return EINA_FALSE;
+}
+
EOLIAN static Eo *
_elm_index_eo_base_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED)
{
@@ -1593,19 +1621,20 @@ _elm_index_item_letter_get(const Eo *item EINA_UNUSED,
Elm_Index_Item_Data *it)
}
EOLIAN static void
-_elm_index_horizontal_set(Eo *obj, Elm_Index_Data *sd, Eina_Bool horizontal)
+_elm_index_efl_orientation_orientation_set(Eo *obj, Elm_Index_Data *sd,
Efl_Orient dir)
{
- horizontal = !!horizontal;
- if (horizontal == sd->horizontal) return;
+ if ((dir != EFL_ORIENT_HORIZONTAL) && (dir != EFL_ORIENT_VERTICAL))
+ return;
+
+
[EGIT] [core/efl] master 01/01: Separtor: use orientation APIs
ami pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f043c3be617f7257001b9fc779b64cebf4370781
commit f043c3be617f7257001b9fc779b64cebf4370781
Author: Yeshwanth Reddivari
Date: Fri May 27 10:11:12 2016 +0530
Separtor: use orientation APIs
Summary: Use orientation APIs instead of horizontal get/set apis.
Test Plan: elementary_test -to separator
Reviewers: jpeg, cedric, Hermet, raster, singh.amitesh
Reviewed By: singh.amitesh
Differential Revision: https://phab.enlightenment.org/D3984
---
src/bin/elementary/test_separator.c | 4 +--
src/lib/elementary/elm_separator.c| 47 +--
src/lib/elementary/elm_separator.eo | 16 ++-
src/lib/elementary/elm_separator_legacy.h | 20 -
src/lib/elementary/elm_widget_separator.h | 2 +-
5 files changed, 63 insertions(+), 26 deletions(-)
diff --git a/src/bin/elementary/test_separator.c
b/src/bin/elementary/test_separator.c
index 00d9985..40aff19 100644
--- a/src/bin/elementary/test_separator.c
+++ b/src/bin/elementary/test_separator.c
@@ -28,7 +28,7 @@ test_separator(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event
evas_object_show(bt);
sp = elm_separator_add(win);
- elm_separator_horizontal_set(sp, EINA_TRUE); // by default, separator is
vertical, we must set it horizontal
+ efl_orientation_set(sp, EFL_ORIENT_HORIZONTAL);
elm_box_pack_end(bx, sp);
evas_object_show(sp);
@@ -54,7 +54,7 @@ test_separator(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event
evas_object_show(bt);
sp = elm_separator_add(win);
- elm_separator_horizontal_set(sp, EINA_TRUE);
+ efl_orientation_set(sp, EFL_ORIENT_HORIZONTAL);
elm_box_pack_end(bx, sp);
evas_object_show(sp);
diff --git a/src/lib/elementary/elm_separator.c
b/src/lib/elementary/elm_separator.c
index 2e940d9..6c5ca2f 100644
--- a/src/lib/elementary/elm_separator.c
+++ b/src/lib/elementary/elm_separator.c
@@ -21,7 +21,7 @@ _elm_separator_elm_widget_theme_apply(Eo *obj,
Elm_Separator_Data *sd EINA_UNUSE
Eina_Bool int_ret = EINA_FALSE;
ELM_LAYOUT_DATA_GET(obj, ld);
- if (sd->horizontal)
+ if (sd->orientation == EFL_ORIENT_HORIZONTAL)
eina_stringshare_replace(&ld->group, "horizontal");
else
eina_stringshare_replace(&ld->group, "vertical");
@@ -51,6 +51,8 @@ _elm_separator_evas_object_smart_add(Eo *obj,
Elm_Separator_Data *sd EINA_UNUSED
elm_widget_sub_object_parent_add(obj);
elm_widget_can_focus_set(obj, EINA_FALSE);
+ sd->orientation = EFL_ORIENT_VERTICAL;
+
if (!elm_layout_theme_set
(obj, "separator", "vertical", elm_widget_style_get(obj)))
CRI("Failed to set layout!");
@@ -66,6 +68,32 @@ elm_separator_add(Evas_Object *parent)
return obj;
}
+EAPI void
+elm_separator_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
+{
+ Efl_Orient orient;
+
+ if (horizontal)
+ orient = EFL_ORIENT_HORIZONTAL;
+ else
+ orient = EFL_ORIENT_VERTICAL;
+
+ if (orient == efl_orientation_get(obj)) return;
+
+ efl_orientation_set(obj, orient);
+}
+
+EAPI Eina_Bool
+elm_separator_horizontal_get(const Evas_Object *obj)
+{
+ ELM_SEPARATOR_DATA_GET_OR_RETURN_VAL(obj, sd, EINA_FALSE);
+
+ if (sd->orientation == EFL_ORIENT_VERTICAL)
+ return EINA_FALSE;
+ else
+ return EINA_TRUE;
+}
+
EOLIAN static Eo *
_elm_separator_eo_base_constructor(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
{
@@ -77,20 +105,23 @@ _elm_separator_eo_base_constructor(Eo *obj,
Elm_Separator_Data *sd EINA_UNUSED)
}
EOLIAN static void
-_elm_separator_horizontal_set(Eo *obj, Elm_Separator_Data *sd, Eina_Bool
horizontal)
+_elm_separator_efl_orientation_orientation_set(Eo *obj, Elm_Separator_Data
*sd, Efl_Orient dir)
{
- horizontal = !!horizontal;
- if (sd->horizontal == horizontal) return;
+ if (dir != EFL_ORIENT_VERTICAL &&
+ dir != EFL_ORIENT_HORIZONTAL)
+ return;
+
+ if (sd->orientation == dir) return;
- sd->horizontal = horizontal;
+ sd->orientation = dir;
elm_obj_widget_theme_apply(obj);
}
-EOLIAN static Eina_Bool
-_elm_separator_horizontal_get(Eo *obj EINA_UNUSED, Elm_Separator_Data *sd)
+EOLIAN static Efl_Orient
+_elm_separator_efl_orientation_orientation_get(Eo *obj EINA_UNUSED,
Elm_Separator_Data *sd)
{
- return sd->horizontal;
+ return sd->orientation;
}
EOLIAN static Eina_Bool
diff --git a/src/lib/elementary/elm_separator.eo
b/src/lib/elementary/elm_separator.eo
index c190c20..a0cbf51 100644
--- a/src/lib/elementary/elm_separator.eo
+++ b/src/lib/elementary/elm_separator.eo
@@ -1,20 +1,7 @@
-class Elm.Separator (Elm.Layout)
+class Elm.Separator (Elm.Layout, Efl.Orientation)
{
legacy_prefix: elm_separator;
eo_prefix: elm_obj_separator;
- methods {
- @property horizontal {
-
[EGIT] [core/efl] efl-1.16 01/64: Edje: Remove duplicate NULL reassignment
furrymyad pushed a commit to branch efl-1.16. http://git.enlightenment.org/core/efl.git/commit/?id=2196429f21f37c26098a420e8308ef3819db1601 commit 2196429f21f37c26098a420e8308ef3819db1601 Author: Yeshwanth Reddivari Date: Mon Nov 23 18:51:08 2015 +0900 Edje: Remove duplicate NULL reassignment Summary: Remove duplicate code of variable 's' assignment to NULL in edje_edit_style_del. Signed-off-by: Yeshwanth Reddivari Reviewers: Hermet, alok25, mvsovani, singh.amitesh, jpeg Reviewed By: jpeg Subscribers: sachin.dev, cedric Differential Revision: https://phab.enlightenment.org/D3358 --- src/lib/edje/edje_edit.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index f989e82..69e8051 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -2705,8 +2705,6 @@ edje_edit_style_del(Evas_Object *obj, const char *style) t = NULL; } free(s); - s = NULL; - s = NULL; return EINA_TRUE; } --
[EGIT] [core/efl] master 01/01: elm video: implement player interface
ami pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a1b0fb2c9f95b94e705bba8a0ad6d0f65a5506b0
commit a1b0fb2c9f95b94e705bba8a0ad6d0f65a5506b0
Author: Yeshwanth Reddivari
Date: Wed Jun 8 14:46:11 2016 +0530
elm video: implement player interface
Reviewers: raster, cedric, jpeg, singh.amitesh
Reviewed By: singh.amitesh
Differential Revision: https://phab.enlightenment.org/D4021
---
src/lib/elementary/elm_video.c| 63 +
src/lib/elementary/elm_video.eo | 56 --
src/lib/elementary/elm_video_legacy.h | 75 +++
3 files changed, 137 insertions(+), 57 deletions(-)
diff --git a/src/lib/elementary/elm_video.c b/src/lib/elementary/elm_video.c
index 65a5d6e..6ef84fc 100644
--- a/src/lib/elementary/elm_video.c
+++ b/src/lib/elementary/elm_video.c
@@ -373,49 +373,49 @@ _elm_video_is_playing_get(Eo *obj EINA_UNUSED,
Elm_Video_Data *sd)
}
EOLIAN static Eina_Bool
-_elm_video_is_seekable_get(Eo *obj EINA_UNUSED, Elm_Video_Data *sd)
+_elm_video_efl_player_seekable_get(Eo *obj EINA_UNUSED, Elm_Video_Data *sd)
{
return emotion_object_seekable_get(sd->emotion);
}
EOLIAN static Eina_Bool
-_elm_video_audio_mute_get(Eo *obj EINA_UNUSED, Elm_Video_Data *sd)
+_elm_video_efl_player_audio_mute_get(Eo *obj EINA_UNUSED, Elm_Video_Data *sd)
{
return emotion_object_audio_mute_get(sd->emotion);
}
EOLIAN static void
-_elm_video_audio_mute_set(Eo *obj EINA_UNUSED, Elm_Video_Data *sd, Eina_Bool
mute)
+_elm_video_efl_player_audio_mute_set(Eo *obj EINA_UNUSED, Elm_Video_Data *sd,
Eina_Bool mute)
{
emotion_object_audio_mute_set(sd->emotion, mute);
}
EOLIAN static double
-_elm_video_audio_level_get(Eo *obj EINA_UNUSED, Elm_Video_Data *sd)
+_elm_video_efl_player_audio_volume_get(Eo *obj EINA_UNUSED, Elm_Video_Data *sd)
{
return emotion_object_audio_volume_get(sd->emotion);
}
EOLIAN static void
-_elm_video_audio_level_set(Eo *obj EINA_UNUSED, Elm_Video_Data *sd, double
volume)
+_elm_video_efl_player_audio_volume_set(Eo *obj EINA_UNUSED, Elm_Video_Data
*sd, double volume)
{
emotion_object_audio_volume_set(sd->emotion, volume);
}
EOLIAN static double
-_elm_video_play_position_get(Eo *obj EINA_UNUSED, Elm_Video_Data *sd)
+_elm_video_efl_player_position_get(Eo *obj EINA_UNUSED, Elm_Video_Data *sd)
{
return emotion_object_position_get(sd->emotion);
}
EOLIAN static void
-_elm_video_play_position_set(Eo *obj EINA_UNUSED, Elm_Video_Data *sd, double
position)
+_elm_video_efl_player_position_set(Eo *obj EINA_UNUSED, Elm_Video_Data *sd,
double position)
{
emotion_object_position_set(sd->emotion, position);
}
EOLIAN static double
-_elm_video_play_length_get(Eo *obj EINA_UNUSED, Elm_Video_Data *sd)
+_elm_video_efl_player_length_get(Eo *obj EINA_UNUSED, Elm_Video_Data *sd)
{
return emotion_object_play_length_get(sd->emotion);
}
@@ -480,5 +480,52 @@ elm_video_file_get(Eo *obj, const char **filename)
efl_file_get((Eo *) obj, filename, NULL);
}
+EAPI void
+elm_video_audio_level_set(Evas_Object *obj, double volume)
+{
+ efl_player_audio_volume_set(obj, volume);
+}
+
+EAPI double
+elm_video_audio_level_get(const Evas_Object *obj)
+{
+ return efl_player_audio_volume_get(obj);
+}
+
+EAPI void
+elm_video_audio_mute_set(Evas_Object *obj, Eina_Bool mute)
+{
+ efl_player_audio_mute_set(obj, mute);
+}
+
+EAPI Eina_Bool
+elm_video_audio_mute_get(const Evas_Object *obj)
+{
+ return efl_player_audio_mute_get(obj);
+}
+
+EAPI double
+elm_video_play_length_get(const Evas_Object *obj)
+{
+ return efl_player_length_get(obj);
+}
+
+EAPI Eina_Bool
+elm_video_is_seekable_get(const Evas_Object *obj)
+{
+ return efl_player_seekable_get(obj);
+}
+
+EAPI void
+elm_video_play_position_set(Evas_Object *obj, double position)
+{
+ efl_player_position_set(obj, position);
+}
+
+EAPI double
+elm_video_play_position_get(const Evas_Object *obj)
+{
+ return efl_player_position_get(obj);
+}
#include "elm_video.eo.c"
diff --git a/src/lib/elementary/elm_video.eo b/src/lib/elementary/elm_video.eo
index 0d689b1..0a84352 100644
--- a/src/lib/elementary/elm_video.eo
+++ b/src/lib/elementary/elm_video.eo
@@ -1,19 +1,9 @@
-class Elm.Video (Elm.Layout, Efl.File, Elm.Interface.Atspi_Widget_Action)
+class Elm.Video (Elm.Layout, Efl.File,
+ Efl.Player, Elm.Interface.Atspi_Widget_Action)
{
legacy_prefix: elm_video;
eo_prefix: elm_obj_video;
methods {
- @property audio_level {
- set {
-[[Set the audio level of an Elm_Video object.]]
- }
- get {
-[[Get the audio level of the current video.]]
- }
- values {
-volume: double; [[The audio level.]]
- }
- }
@property remember_position {
set {
[[Set whether the object can remember the last played position.
[EGIT] [core/efl] master 01/01: Label: Fix extra memory allocation of edje message.
ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=55135870ec54cba8f6d7db874f578eb0aca9d571 commit 55135870ec54cba8f6d7db874f578eb0aca9d571 Author: Yeshwanth Reddivari Date: Fri Jun 10 13:36:57 2016 +0530 Label: Fix extra memory allocation of edje message. Summary: Edje_Message_Float_Set struct is already allocating double and hence no need to add extra double allocation. Reviewers: Hermet, jpeg, cedric, singh.amitesh Reviewed By: singh.amitesh Differential Revision: https://phab.enlightenment.org/D4035 --- src/lib/elementary/elm_label.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c index ebbce9b..e1a35c5 100644 --- a/src/lib/elementary/elm_label.c +++ b/src/lib/elementary/elm_label.c @@ -154,7 +154,7 @@ _label_slide_change(Evas_Object *obj) } Edje_Message_Float_Set *msg = - alloca(sizeof(Edje_Message_Float_Set) + (sizeof(double))); + alloca(sizeof(Edje_Message_Float_Set)); msg->count = 1; msg->val[0] = sd->slide_duration; --
[EGIT] [core/efl] master 01/11: efl_ui_video: convert elm_video to efl_ui_video
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=549e274acb69131b5fb7dccc1659372cef7a6572
commit 549e274acb69131b5fb7dccc1659372cef7a6572
Author: Yeshwanth Reddivari
Date: Wed Jun 22 16:50:05 2016 -0700
efl_ui_video: convert elm_video to efl_ui_video
Test Plan: elementary_test -to video
Reviewers: singh.amitesh, raster, cedric, jpeg
Differential Revision: https://phab.enlightenment.org/D4066
Signed-off-by: Cedric BAIL
---
src/Makefile_Elementary.am | 12 ++---
src/lib/elementary/Elementary.h.in | 2 +-
src/lib/elementary/Makefile.am | 12 ++---
src/lib/elementary/{elm_video.c => efl_ui_video.c} | 56 +++---
.../elementary/{elm_video.eo => efl_ui_video.eo} | 3 +-
src/lib/elementary/{elm_video.h => efl_ui_video.h} | 16 +++
src/lib/elementary/efl_ui_video_eo.h | 2 +
.../{elm_video_legacy.h => efl_ui_video_legacy.h} | 2 +-
.../{elm_widget_video.h => efl_ui_video_private.h} | 24 +-
src/lib/elementary/elm_video_eo.h | 2 -
10 files changed, 65 insertions(+), 66 deletions(-)
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index d5ebf61..27948de 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -90,7 +90,7 @@ elm_public_eolian_files = \
lib/elementary/elm_systray.eo \
lib/elementary/elm_thumb.eo \
lib/elementary/elm_toolbar.eo \
- lib/elementary/elm_video.eo \
+ lib/elementary/efl_ui_video.eo \
lib/elementary/elm_view_list.eo \
lib/elementary/elm_view_form.eo \
lib/elementary/elm_web.eo \
@@ -267,7 +267,7 @@ includesunstable_HEADERS = \
lib/elementary/elm_widget_table.h \
lib/elementary/elm_widget_thumb.h \
lib/elementary/elm_widget_toolbar.h \
- lib/elementary/elm_widget_video.h \
+ lib/elementary/efl_ui_video_private.h \
lib/elementary/elm_widget_web.h \
lib/elementary/elm_code.h \
lib/elementary/elm_code_widget_legacy.h \
@@ -534,9 +534,9 @@ includesub_HEADERS = \
lib/elementary/elm_toolbar_legacy.h \
lib/elementary/elm_tooltip.h \
lib/elementary/elm_transit.h \
- lib/elementary/elm_video.h \
- lib/elementary/elm_video_eo.h \
- lib/elementary/elm_video_legacy.h \
+ lib/elementary/efl_ui_video.h \
+ lib/elementary/efl_ui_video_eo.h \
+ lib/elementary/efl_ui_video_legacy.h \
lib/elementary/elm_view_list.h \
lib/elementary/elm_view_form.h \
lib/elementary/elm_web.h \
@@ -676,7 +676,7 @@ lib_elementary_libelementary_la_SOURCES = \
lib/elementary/elm_transit.c \
lib/elementary/elm_util.c \
lib/elementary/elm_url.c \
- lib/elementary/elm_video.c \
+ lib/elementary/efl_ui_video.c \
lib/elementary/elm_view_list.c \
lib/elementary/elm_view_form.c \
lib/elementary/elm_web2.c \
diff --git a/src/lib/elementary/Elementary.h.in
b/src/lib/elementary/Elementary.h.in
index d7d3302..405afc1 100644
--- a/src/lib/elementary/Elementary.h.in
+++ b/src/lib/elementary/Elementary.h.in
@@ -261,7 +261,7 @@ EAPI extern Elm_Version *elm_version;
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/src/lib/elementary/Makefile.am b/src/lib/elementary/Makefile.am
index 49f48cd..98bddca 100644
--- a/src/lib/elementary/Makefile.am
+++ b/src/lib/elementary/Makefile.am
@@ -97,7 +97,7 @@ elm_eolian_files = \
elm_table.eo \
elm_thumb.eo \
elm_toolbar.eo \
- elm_video.eo \
+ efl_ui_video.eo \
elm_view_list.eo \
elm_view_form.eo \
elm_web.eo \
@@ -225,7 +225,7 @@ includesunstable_HEADERS = \
elm_widget_table.h \
elm_widget_thumb.h \
elm_widget_toolbar.h \
- elm_widget_video.h \
+ efl_ui_video_private.h \
elm_widget_web.h
includesunstabledir = $(includedir)/elementary-@VMAJ@
@@ -480,9 +480,9 @@ includesub_HEADERS = \
elm_toolbar_legacy.h \
elm_tooltip.h \
elm_transit.h \
- elm_video.h \
- elm_video_eo.h \
- elm_video_legacy.h \
+ efl_ui_video.h \
+ efl_ui_video_eo.h \
+ efl_ui_video_legacy.h \
elm_view_list.h \
elm_view_form.h \
elm_web.h \
@@ -614,7 +614,7 @@ libelementary_la_SOURCES = \
elm_transit.c \
elm_util.c \
elm_url.c \
- elm_video.c \
+ efl_ui_video.c \
elm_view_list.c \
elm_view_form.c \
elm_web2.c \
diff --git a/src/lib/elementary/elm_video.c b/src/lib/elementary/efl_ui_video.c
similarity index 84%
rename from src/lib/elementary/elm_video.c
rename to src/lib/elementary/efl_ui_video.c
index 1ba65d7..190cb1a 100644
--- a/src/lib/elementary/elm_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -9,16 +9,16
[EGIT] [core/efl] master 01/01: emotion: convert Emotion_Object into Efl.Canvas.Video
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7b90e1147442d6a8023422400bffd77e2815fe0b
commit 7b90e1147442d6a8023422400bffd77e2815fe0b
Author: Yeshwanth Reddivari
Date: Wed Sep 21 10:37:59 2016 -0700
emotion: convert Emotion_Object into Efl.Canvas.Video
Reviewers: singh.amitesh, raster, jpeg, cedric
Differential Revision: https://phab.enlightenment.org/D3994
Signed-off-by: Cedric BAIL
---
src/Makefile_Emotion.am| 2 +-
src/lib/efl/interfaces/efl_player.eo | 4 +-
src/lib/elementary/efl_ui_video.c | 20 +-
src/lib/elementary/elc_player.c| 12 +-
src/lib/emotion/Emotion_Eo.h | 2 +-
src/lib/emotion/Emotion_Legacy.h | 3 +-
.../{emotion_object.eo => efl_canvas_video.eo} | 50 ++-
src/lib/emotion/emotion_smart.c| 344 -
src/modules/ethumb/emotion/emotion.c | 28 +-
src/tests/emotion/emotion_test_main-eo.c | 22 +-
10 files changed, 261 insertions(+), 226 deletions(-)
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 42966ce..8c31f41 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -1,7 +1,7 @@
### Library
emotion_eolian_files = \
- lib/emotion/emotion_object.eo
+ lib/emotion/efl_canvas_video.eo
emotion_eolian_c = $(emotion_eolian_files:%.eo=%.eo.c)
emotion_eolian_h = $(emotion_eolian_files:%.eo=%.eo.h) \
diff --git a/src/lib/efl/interfaces/efl_player.eo
b/src/lib/efl/interfaces/efl_player.eo
index 41b1395..b95780a 100644
--- a/src/lib/efl/interfaces/efl_player.eo
+++ b/src/lib/efl/interfaces/efl_player.eo
@@ -71,7 +71,7 @@ interface Efl.Player {
speed: double; [[The play speed in the [0, infinity) range.]]
}
}
-@property audio_volume {
+@property volume {
[[Control the audio volume.
Controls the audio volume of the stream being played. This has
@@ -88,7 +88,7 @@ interface Efl.Player {
volume: double; [[The volume level]]
}
}
-@property audio_mute {
+@property mute {
[[This property controls the audio mute state.]]
set {
}
diff --git a/src/lib/elementary/efl_ui_video.c
b/src/lib/elementary/efl_ui_video.c
index 8c107a3..5808353 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -50,12 +50,12 @@ static const Elm_Action key_actions[] = {
};
EFL_CALLBACKS_ARRAY_DEFINE(_video_cb,
- { EMOTION_OBJECT_EVENT_OPEN_DONE, _on_open_done },
- { EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _on_playback_started },
- { EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _on_playback_finished },
- { EMOTION_OBJECT_EVENT_FRAME_RESIZE, _on_aspect_ratio_updated },
- { EMOTION_OBJECT_EVENT_TITLE_CHANGE, _on_title_changed },
- { EMOTION_OBJECT_EVENT_AUDIO_LEVEL_CHANGE, _on_audio_level_changed }
+ { EFL_CANVAS_VIDEO_EVENT_OPEN_DONE, _on_open_done },
+ { EFL_CANVAS_VIDEO_EVENT_PLAYBACK_START, _on_playback_started },
+ { EFL_CANVAS_VIDEO_EVENT_PLAYBACK_STOP, _on_playback_finished },
+ { EFL_CANVAS_VIDEO_EVENT_FRAME_RESIZE, _on_aspect_ratio_updated },
+ { EFL_CANVAS_VIDEO_EVENT_TITLE_CHANGE, _on_title_changed },
+ { EFL_CANVAS_VIDEO_EVENT_VOLUME_CHANGE, _on_audio_level_changed }
);
static Eina_Bool
@@ -426,25 +426,25 @@ elm_video_file_get(Eo *obj, const char **filename)
EAPI void
elm_video_audio_level_set(Evas_Object *obj, double volume)
{
- efl_player_audio_volume_set(obj, volume);
+ efl_player_volume_set(obj, volume);
}
EAPI double
elm_video_audio_level_get(const Evas_Object *obj)
{
- return efl_player_audio_volume_get(obj);
+ return efl_player_volume_get(obj);
}
EAPI void
elm_video_audio_mute_set(Evas_Object *obj, Eina_Bool mute)
{
- efl_player_audio_mute_set(obj, mute);
+ efl_player_mute_set(obj, mute);
}
EAPI Eina_Bool
elm_video_audio_mute_get(const Evas_Object *obj)
{
- return efl_player_audio_mute_get(obj);
+ return efl_player_mute_get(obj);
}
EAPI double
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index 86c4165..f59be6f 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -78,12 +78,12 @@ static const Elm_Action key_actions[] = {
};
EFL_CALLBACKS_ARRAY_DEFINE(_emotion_cb,
- { EMOTION_OBJECT_EVENT_FRAME_DECODE, _update_frame },
- { EMOTION_OBJECT_EVENT_FRAME_RESIZE, _update_slider },
- { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, _update_slider },
- { EMOTION_OBJECT_EVENT_POSITION_UPDATE, _update_frame },
- { EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _play_started },
- { EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _play_finished }
+ { EFL_CANVAS_VIDEO_EVENT_FRAME_DECODE, _update_frame },
+ { EFL_CANVAS_VIDEO_EVENT_FRAME_RES
