[EGIT] [e16/e16] master 01/01: Autofoo update (AC_PROG_LIBTOOL -> LT_INIT).
kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=db285ed1dd60f9dd46864c221822c650d671bb9f commit db285ed1dd60f9dd46864c221822c650d671bb9f Author: Kim Woelders Date: Sat Jan 11 16:06:43 2014 +0100 Autofoo update (AC_PROG_LIBTOOL -> LT_INIT). --- configure.ac | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 77aca7e..aa89624 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ m4_define([pkg_revision], [004]) m4_define([pkg_version], m4_ifdef([pkg_revision], [pkg_version.pkg_revision], [pkg_version])) m4_define([rpm_revision], m4_ifdef([pkg_revision], ["0.%(date '+%y%m%d')"], [1])) -AC_INIT([e16], [pkg_version], [enlightenment-devel@lists.sourceforge.net]) +AC_INIT([e16],[pkg_version],[enlightenment-devel@lists.sourceforge.net]) AM_INIT_AUTOMAKE([foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -33,8 +33,7 @@ define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])dnl AC_ENABLE_SHARED AC_DISABLE_STATIC -AC_LIBTOOL_DLOPEN -AC_PROG_LIBTOOL +LT_INIT([dlopen]) AC_PATH_X AC_PATH_XTRA --
[EGIT] [e16/e16-epplets] master 01/01: Autofoo update (AC_PROG_LIBTOOL -> LT_INIT).
kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16-epplets.git/commit/?id=4329400927e45d2b911f2b44a263c0c23192e79f commit 4329400927e45d2b911f2b44a263c0c23192e79f Author: Kim Woelders Date: Sun Feb 16 10:34:45 2014 +0100 Autofoo update (AC_PROG_LIBTOOL -> LT_INIT). Also tidy up a bit in Makefile.am. --- Makefile.am | 7 +++ configure.ac | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 848c5ae..39f7004 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,8 +6,7 @@ SUBDIRS = api epplets #EXTRA_DIST = -MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.* configure depcomp \ - install-sh ltmain.sh missing */Makefile.in m4/*.m4 +MAINTAINERCLEANFILES = \ + Makefile.in aclocal.m4 compile config.* configure depcomp \ + install-sh ltmain.sh missing */Makefile.in m4/*.m4 -changelog: - cvs2cl -l "-d>20050101" --gmt --separate-header --tagdates --no-indent diff --git a/configure.ac b/configure.ac index b3ae7e5..e8533e4 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ m4_define([pkg_revision], [000]) m4_define([pkg_version], m4_ifdef([pkg_revision], [pkg_version.pkg_revision], [pkg_version])) m4_define([rpm_revision], m4_ifdef([pkg_revision], ["0.%(date '+%y%m%d')"], [1])) -AC_INIT([e16-epplets], [pkg_version], [enlightenment-devel@lists.sourceforge.net]) +AC_INIT([e16-epplets],[pkg_version],[enlightenment-devel@lists.sourceforge.net]) AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_MACRO_DIR([m4]) @@ -25,7 +25,7 @@ define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])dnl AC_ENABLE_SHARED -AC_PROG_LIBTOOL +LT_INIT AC_PROG_INSTALL --
[EGIT] [core/efl] master 02/02: ecore timer: change name of Eo constructor, to avoid clash in Eolian
yakov pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f7808f1f22f1d149d61e2f5b086006e943a68b61
commit f7808f1f22f1d149d61e2f5b086006e943a68b61
Author: Yakov Goldberg
Date: Sun Feb 16 11:50:13 2014 +0200
ecore timer: change name of Eo constructor, to avoid clash in Eolian
---
src/lib/ecore/Ecore_Eo.h| 4 ++--
src/lib/ecore/ecore_timer.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index 2a8fe41..c490457 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -128,7 +128,7 @@ extern EAPI Eo_Op ECORE_TIMER_BASE_ID;
enum
{
- ECORE_TIMER_SUB_ID_CONSTRUCTOR,
+ ECORE_TIMER_SUB_ID_TIMER_CONSTRUCTOR,
ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR,
ECORE_TIMER_SUB_ID_INTERVAL_SET,
ECORE_TIMER_SUB_ID_INTERVAL_GET,
@@ -151,7 +151,7 @@ enum
* @param[in] data
*
*/
-#define ecore_timer_constructor(in, func, data)
ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_CONSTRUCTOR), EO_TYPECHECK(double, in),
EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
+#define ecore_timer_constructor(in, func, data)
ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_TIMER_CONSTRUCTOR), EO_TYPECHECK(double, in),
EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
/**
* @def ecore_timer_loop_constructor
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index e6e488c..c770c14 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -1002,7 +1002,7 @@ _class_constructor(Eo_Class *klass)
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor),
-EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_CONSTRUCTOR),
_timer_constructor),
+EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_TIMER_CONSTRUCTOR),
_timer_constructor),
EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR),
_timer_loop_constructor),
EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_SET),
_timer_interval_set),
EO_OP_FUNC(ECORE_TIMER_ID(ECORE_TIMER_SUB_ID_INTERVAL_GET),
_timer_interval_get),
@@ -1021,7 +1021,7 @@ _class_constructor(Eo_Class *klass)
}
static const Eo_Op_Description op_desc[] = {
- EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_CONSTRUCTOR, "Creates a timer to
call the given function in the given period of time."),
+ EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_TIMER_CONSTRUCTOR, "Creates a timer
to call the given function in the given period of time."),
EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_LOOP_CONSTRUCTOR, "Creates a timer
to call the given function in the given period of time."),
EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_INTERVAL_SET, "Change the interval
the timer ticks of."),
EO_OP_DESCRIPTION(ECORE_TIMER_SUB_ID_INTERVAL_GET, "Get the interval the
timer ticks on."),
--
[EGIT] [core/efl] master 01/02: ecore animator: change name of Eo constructor, to avoid clash in Eolian
yakov pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=16c43796a6e888b858233e393c4b65c0ee6779a0
commit 16c43796a6e888b858233e393c4b65c0ee6779a0
Author: Yakov Goldberg
Date: Sun Feb 16 11:39:10 2014 +0200
ecore animator: change name of Eo constructor, to avoid clash in Eolian
---
src/lib/ecore/Ecore_Eo.h | 4 ++--
src/lib/ecore/ecore_anim.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index 0daf06a..2a8fe41 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -80,7 +80,7 @@ extern EAPI Eo_Op ECORE_ANIMATOR_BASE_ID;
enum
{
- ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR,
+ ECORE_ANIMATOR_SUB_ID_ANIMATOR_CONSTRUCTOR,
ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR,
ECORE_ANIMATOR_SUB_ID_LAST
};
@@ -97,7 +97,7 @@ enum
* @param[in] data
*
*/
-#define ecore_animator_constructor(func, data)
ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR),
EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
+#define ecore_animator_constructor(func, data)
ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_ANIMATOR_CONSTRUCTOR),
EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
/**
* @def ecore_animator_timeline_constructor
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index 2bdd8d1..43985a6 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -712,7 +712,7 @@ _class_constructor(Eo_Class *klass)
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_EVENT_FREEZE),
_ecore_animator_freeze),
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_EVENT_THAW),
_ecore_animator_thaw),
-EO_OP_FUNC(ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR),
_animator_constructor),
+
EO_OP_FUNC(ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_ANIMATOR_CONSTRUCTOR),
_animator_constructor),
EO_OP_FUNC(ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR),
_animator_timeline_constructor),
EO_OP_FUNC_SENTINEL
};
@@ -721,7 +721,7 @@ _class_constructor(Eo_Class *klass)
}
static const Eo_Op_Description op_desc[] = {
- EO_OP_DESCRIPTION(ECORE_ANIMATOR_SUB_ID_CONSTRUCTOR, "Add an animator to
call func at every animation tick during main loop execution."),
+ EO_OP_DESCRIPTION(ECORE_ANIMATOR_SUB_ID_ANIMATOR_CONSTRUCTOR, "Add an
animator to call func at every animation tick during main loop execution."),
EO_OP_DESCRIPTION(ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR, "Add an
animator that runs for a limited time"),
EO_OP_DESCRIPTION_SENTINEL
};
--
[EGIT] [core/elementary] master 01/01: theme - scroller - noclip style
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f8fa996f8dec840b0f886ba0cd022f342adf29f3
commit f8fa996f8dec840b0f886ba0cd022f342adf29f3
Author: Carsten Haitzler (Rasterman)
Date: Sun Feb 16 21:09:45 2014 +0900
theme - scroller - noclip style
---
data/themes/edc/elm/scroller.edc | 28
1 file changed, 28 insertions(+)
diff --git a/data/themes/edc/elm/scroller.edc b/data/themes/edc/elm/scroller.edc
index e36abd6..339a164 100644
--- a/data/themes/edc/elm/scroller.edc
+++ b/data/themes/edc/elm/scroller.edc
@@ -805,3 +805,31 @@ group { name: "elm/scroller/base/default";
}
}
}
+
+group { name: "elm/scroller/base/noclip";
+ inherit: "elm/scroller/base/default";
+ parts {
+ part { name: "elm.swallow.background";
+ description { state: "default" 0.0;
+rel1.offset: 0 0;
+rel2.offset: -1 -1;
+ }
+ }
+ part { name: "elm.swallow.content";
+ description { state: "default" 0.0;
+rel1.offset: 0 1;
+rel2.offset: -1 -1;
+ }
+ }
+ part { name: "inset";
+ description { state: "default" 0.0;
+visible: 0;
+ }
+ }
+ part { name: "shadow";
+ description { state: "default" 0.0;
+visible: 0;
+ }
+ }
+ }
+}
--
[EGIT] [apps/rage] master 01/01: use noclip style for scroller and upgrade vid list item look
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=ae2e2d888f46f5fc6efd9f06e8755fba6c48ce89
commit ae2e2d888f46f5fc6efd9f06e8755fba6c48ce89
Author: Carsten Haitzler (Rasterman)
Date: Sun Feb 16 21:10:01 2014 +0900
use noclip style for scroller and upgrade vid list item look
---
data/themes/default.edc | 40
data/themes/images/Makefile.am | 4 +++-
data/themes/images/bg_glint.png | Bin 0 -> 343 bytes
data/themes/images/bg_shine.png | Bin 0 -> 7300 bytes
src/bin/winlist.c | 1 +
5 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index bc8d870..d06e4e2 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1144,6 +1144,8 @@ collections {
group { name: "rage/list/item";
images.image: "win_shadow.png" COMP;
images.image: "win_glow.png" COMP;
+ images.image: "bg_shine.png" COMP;
+ images.image: "bg_glint.png" COMP;
parts {
part { name: "shadow"; mouse_events: 0;
@@ -1204,6 +1206,13 @@ collections {
rel2.offset: -5 -5;
}
}
+ part { name: "glintclip"; type: RECT;
+description { state: "default" 0.0;
+ rel1.to: "clip";
+ rel2.to: "clip";
+ rel1.offset: 0 -10;
+}
+ }
part { name: "rage.sizer"; type: SWALLOW;
description { state: "default" 0.0;
min: 16 16;
@@ -1218,6 +1227,37 @@ collections {
rel2.to: "clip";
}
}
+ part { name: "shine"; mouse_events: 0;
+clip_to: "clip";
+description { state: "default" 0.0;
+ image.normal: "bg_shine.png";
+ fill.smooth: 0;
+ rel1.to: "clip";
+ rel2.to: "clip";
+ align: 0.5 0.0;
+ aspect: (255/120) (255/120);
+ aspect_preference: HORIZONTAL;
+}
+ }
+ part { name: "glint"; mouse_events: 0;
+clip_to: "glintclip";
+description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 79 5;
+ max: 79 5;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ to: "clip";
+ }
+ rel2 {
+ relative: 1.0 0.0;
+ offset: -1 0;
+ to: "clip";
+ }
+ image.normal: "bg_glint.png";
+}
+ }
part { name: "rage.title"; type: TEXT; mouse_events: 0;
effect: GLOW;
scale: 1;
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index dfa56ff..ddf0fed 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -30,4 +30,6 @@ pos_indicator_big.png \
bevel_dark_out.png \
bg_bevel.png \
win_glow.png \
-win_shadow.png
+win_shadow.png \
+bg_glint.png \
+bg_shine.png
diff --git a/data/themes/images/bg_glint.png b/data/themes/images/bg_glint.png
new file mode 100644
index 000..0fe17c0
Binary files /dev/null and b/data/themes/images/bg_glint.png differ
diff --git a/data/themes/images/bg_shine.png b/data/themes/images/bg_shine.png
new file mode 100644
index 000..c3cd9a2
Binary files /dev/null and b/data/themes/images/bg_shine.png differ
diff --git a/src/bin/winlist.c b/src/bin/winlist.c
index 39f41b4..3ad557b 100644
--- a/src/bin/winlist.c
+++ b/src/bin/winlist.c
@@ -238,6 +238,7 @@ win_list_show(Evas_Object *win)
evas_object_show(mb);
sc = elm_scroller_add(win);
+ elm_object_style_set(sc, "noclip");
elm_object_focus_allow_set(sc, EINA_FALSE);
evas_object_size_hint_weight_set(sc, 1.0, 1.0);
evas_object_size_hint_align_set(sc, -1.0, -1.0);
--
[EGIT] [core/elementary] master 01/01: theme - noclip - actually no clip
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=bfca58f0854d9ec1b5365a51a80d3d11865aba43
commit bfca58f0854d9ec1b5365a51a80d3d11865aba43
Author: Carsten Haitzler (Rasterman)
Date: Sun Feb 16 21:14:45 2014 +0900
theme - noclip - actually no clip
---
data/themes/edc/elm/scroller.edc | 6 ++
1 file changed, 6 insertions(+)
diff --git a/data/themes/edc/elm/scroller.edc b/data/themes/edc/elm/scroller.edc
index 339a164..6f09002 100644
--- a/data/themes/edc/elm/scroller.edc
+++ b/data/themes/edc/elm/scroller.edc
@@ -809,6 +809,12 @@ group { name: "elm/scroller/base/default";
group { name: "elm/scroller/base/noclip";
inherit: "elm/scroller/base/default";
parts {
+ part { name: "clipper";
+ description { state: "default" 0.0;
+rel1.offset: -99 -99;
+rel2.offset: 99 99;
+ }
+ }
part { name: "elm.swallow.background";
description { state: "default" 0.0;
rel1.offset: 0 0;
--
[EGIT] [apps/rage] master 01/01: remove mapbuf from vid list
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=5383008606e7e383d25ff79aa6a9636cbfe33a6c commit 5383008606e7e383d25ff79aa6a9636cbfe33a6c Author: Carsten Haitzler (Rasterman) Date: Sun Feb 16 21:14:59 2014 +0900 remove mapbuf from vid list --- src/bin/winlist.c | 13 ++--- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/bin/winlist.c b/src/bin/winlist.c index 3ad557b..882a295 100644 --- a/src/bin/winlist.c +++ b/src/bin/winlist.c @@ -6,7 +6,7 @@ #include "video.h" static Evas_Object *tb = NULL; -static Evas_Object *mb, *sc, *rc, *bx; +static Evas_Object *sc, *rc, *bx; static Ecore_Timer *bring_timer = NULL; static void @@ -228,22 +228,13 @@ win_list_show(Evas_Object *win) evas_object_color_set(rc, 0, 0, 0, 0); elm_table_pack(tb, rc, 0, 0, 1, 1); - mb = elm_mapbuf_add(win); - elm_object_focus_allow_set(mb, EINA_FALSE); - evas_object_size_hint_weight_set(mb, 1.0, 1.0); - evas_object_size_hint_align_set(mb, -1.0, -1.0); - elm_mapbuf_alpha_set(mb, EINA_TRUE); -// elm_mapbuf_enabled_set(mb, EINA_TRUE); - elm_table_pack(tb, mb, 0, 0, 1, 1); - evas_object_show(mb); - sc = elm_scroller_add(win); elm_object_style_set(sc, "noclip"); elm_object_focus_allow_set(sc, EINA_FALSE); evas_object_size_hint_weight_set(sc, 1.0, 1.0); evas_object_size_hint_align_set(sc, -1.0, -1.0); elm_scroller_content_min_limit(sc, EINA_TRUE, EINA_FALSE); - elm_object_content_set(mb, sc); + elm_table_pack(tb, sc, 0, 0, 1, 1); evas_object_show(sc); bx = elm_box_add(win); --
[EGIT] [core/elementary] master 01/01: elm_web2: Fix possible crash when loaded the contents which contains form elements
ryuan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=f38e08b77765daf52fbf94f60dc715e4868c16a9 commit f38e08b77765daf52fbf94f60dc715e4868c16a9 Author: Ryuan Choi Date: Sun Feb 16 21:12:05 2014 +0900 elm_web2: Fix possible crash when loaded the contents which contains form elements ewebkit requires webkit theme to draw form elements so elm_web might be crashed when ewebkit didn't get theme path at debug build. --- src/lib/elm_web2.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c index a9afd0d..7e1c891 100644 --- a/src/lib/elm_web2.c +++ b/src/lib/elm_web2.c @@ -143,6 +143,9 @@ _elm_web_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); + //TODO: need a way to change theme + ewk_view_theme_set(resize_obj, WEBKIT_DATADIR "/themes/default.edj"); + _view_smart_callback_proxy(resize_obj, obj); elm_widget_can_focus_set(obj, EINA_TRUE); #endif --
Re: [E-devel] [EGIT] [core/efl] master 01/01: evas/common: fix segfaults in evas_map_image_loop.c
It doesn't happen in 1.8. It's been introduced in recent re-jigging of that. On Sun, Feb 16, 2014 at 5:15 AM, Cedric BAIL wrote: > On Sat, Feb 15, 2014 at 1:31 AM, Daniel Kolesa wrote: > > q66 pushed a commit to branch master. > > > > > http://git.enlightenment.org/core/efl.git/commit/?id=136cf346e9bbf6d60e3fc9899f506de247d88188 > > > > commit 136cf346e9bbf6d60e3fc9899f506de247d88188 > > Author: Daniel Kolesa > > Date: Fri Feb 14 16:30:51 2014 + > > > > evas/common: fix segfaults in evas_map_image_loop.c > > Sounds useful to backport in 1.8. > > > --- > > src/lib/evas/common/evas_map_image_loop.c | 5 + > > 1 file changed, 5 insertions(+) > > > > diff --git a/src/lib/evas/common/evas_map_image_loop.c > b/src/lib/evas/common/evas_map_image_loop.c > > index b6e6e7b..562f193 100644 > > --- a/src/lib/evas/common/evas_map_image_loop.c > > +++ b/src/lib/evas/common/evas_map_image_loop.c > > @@ -39,7 +39,12 @@ > > DATA32 val1, val2, val3, val4; > > > > u1 = u; > > +if (u1 < 0) u1 = 0; > > +else if (u1 >= swp) u1 = swp - 1; > > + > > v1 = v; > > +if (v1 < 0) v1 = 0; > > +else if (v1 >= shp) v1 = shp - 1; > > > > u2 = u1 + FPFPI1; // next u point > > if (u2 >= swp) u2 = swp - 1; > > > > -- > > > > > > > > > > -- > Cedric BAIL > > > -- > Android apps run on BlackBerry 10 > Introducing the new BlackBerry 10.2.1 Runtime for Android apps. > Now with support for Jelly Bean, Bluetooth, Mapview and more. > Get your Android app in front of a whole new audience. Start now. > > http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- Android apps run on BlackBerry 10 Introducing the new BlackBerry 10.2.1 Runtime for Android apps. Now with support for Jelly Bean, Bluetooth, Mapview and more. Get your Android app in front of a whole new audience. Start now. http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/rage] master 01/02: update winlist on dnd add
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=50909ee575ccf9201a4f8c8f20fd525b9072b6e4
commit 50909ee575ccf9201a4f8c8f20fd525b9072b6e4
Author: Carsten Haitzler (Rasterman)
Date: Sun Feb 16 21:41:05 2014 +0900
update winlist on dnd add
---
src/bin/dnd.c | 7 ++-
src/bin/winlist.c | 13 +
src/bin/winlist.h | 1 +
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/bin/dnd.c b/src/bin/dnd.c
index 08d9461..1678b30 100644
--- a/src/bin/dnd.c
+++ b/src/bin/dnd.c
@@ -2,6 +2,7 @@
#include "main.h"
#include "win.h"
#include "winvid.h"
+#include "winlist.h"
#include "dnd.h"
void
@@ -76,7 +77,11 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
Elm_Selection_Data *ev)
win_video_insert(win, ev->data);
inserted = EINA_TRUE;
}
- if (inserted) win_video_next(win);
+ if (inserted)
+ {
+win_video_next(win);
+win_list_content_update(win);
+ }
return EINA_TRUE;
}
diff --git a/src/bin/winlist.c b/src/bin/winlist.c
index 882a295..d1c2b38 100644
--- a/src/bin/winlist.c
+++ b/src/bin/winlist.c
@@ -324,3 +324,16 @@ win_list_size_update(Evas_Object *win)
evas_object_size_hint_min_set(sizer, w, h);
}
}
+
+void
+win_list_content_update(Evas_Object *win)
+{
+ Eina_List *list;
+
+ if (!tb) return;
+ while ((list = elm_box_children_get(bx)))
+ {
+evas_object_del(list->data);
+ }
+ _fill_box(win);
+}
diff --git a/src/bin/winlist.h b/src/bin/winlist.h
index c06c92a..aa75770 100644
--- a/src/bin/winlist.h
+++ b/src/bin/winlist.h
@@ -6,5 +6,6 @@ void win_list_hide(Evas_Object *win);
void win_list_toggle(Evas_Object *win);
void win_list_sel_update(Evas_Object *win);
void win_list_size_update(Evas_Object *win);
+void win_list_content_update(Evas_Object *win);
#endif
--
[EGIT] [apps/rage] master 02/02: dnd - handle %20 etc. escapes in uri's
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=fd30f5936527d39687ed1c048c0e29b54df0796b
commit fd30f5936527d39687ed1c048c0e29b54df0796b
Author: Carsten Haitzler (Rasterman)
Date: Sun Feb 16 22:01:13 2014 +0900
dnd - handle %20 etc. escapes in uri's
---
src/bin/dnd.c | 68 +--
1 file changed, 61 insertions(+), 7 deletions(-)
diff --git a/src/bin/dnd.c b/src/bin/dnd.c
index 1678b30..fe2baef 100644
--- a/src/bin/dnd.c
+++ b/src/bin/dnd.c
@@ -23,6 +23,45 @@ _cb_drag_pos(void *data EINA_UNUSED, Evas_Object *o
EINA_UNUSED, Evas_Coord x, E
printf("dnd at %i %i act:%i\n", x, y, action);
}
+static int
+_xtov(char x)
+{
+ if ((x >= '0') && (x <= '9')) return x - '0';
+ if ((x >= 'a') && (x <= 'f')) return 10 + (x - 'a');
+ if ((x >= 'A') && (x <= 'F')) return 10 + (x - 'A');
+ return 0;
+}
+
+static char *
+_escape_parse(const char *str)
+{
+ char *dest = malloc(strlen(str) + 1);
+ char *d;
+ const char *s;
+
+ printf("conv '%s'\n", str);
+ for (d = dest, s = str; *s; d++)
+ {
+if (s[0] == '%')
+ {
+ if (s[1] && s[2])
+ {
+ *d = (_xtov(s[1]) << 4) | (_xtov(s[2]));
+ s += 3;
+ }
+ else s++;
+ }
+else
+ {
+ *d = s[0];
+ s++;
+ }
+ }
+ *d = 0;
+ printf("'%s'\n", dest);
+ return dest;
+}
+
Eina_Bool
_cb_drop(void *data, Evas_Object *o EINA_UNUSED, Elm_Selection_Data *ev)
{
@@ -32,7 +71,7 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
Elm_Selection_Data *ev)
if (!ev->data) return EINA_TRUE;
if (strchr(ev->data, '\n'))
{
-char *p, *p2, *p3, *tb;
+char *p, *p2, *p3, *tb, *tt;
tb = malloc(strlen(ev->data) + 1);
if (tb)
@@ -54,8 +93,13 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
Elm_Selection_Data *ev)
while ((*p) && (isspace(*p))) p++;
if (strlen(tb) > 0)
{
-win_video_insert(win, tb);
-inserted = EINA_TRUE;
+tt = _escape_parse(tb);
+if (tt)
+ {
+ win_video_insert(win, tt);
+ inserted = EINA_TRUE;
+ free(tt);
+ }
}
}
else
@@ -63,8 +107,13 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
Elm_Selection_Data *ev)
strcpy(tb, p);
if (strlen(tb) > 0)
{
-win_video_insert(win, tb);
-inserted = EINA_TRUE;
+tt = _escape_parse(tb);
+if (tt)
+ {
+ win_video_insert(win, tt);
+ inserted = EINA_TRUE;
+ free(tt);
+ }
}
break;
}
@@ -74,8 +123,13 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
Elm_Selection_Data *ev)
}
else
{
-win_video_insert(win, ev->data);
-inserted = EINA_TRUE;
+char *tt = _escape_parse(ev->data);
+if (tt)
+ {
+ win_video_insert(win, tt);
+ inserted = EINA_TRUE;
+ free(tt);
+ }
}
if (inserted)
{
--
[EGIT] [core/emotion_generic_players] master 01/01: Emotion VLC backend: fix pause/stop to work again.
davemds pushed a commit to branch master. http://git.enlightenment.org/core/emotion_generic_players.git/commit/?id=d5c9aa0d4b38c22fab05d468958bea0abe448097 commit d5c9aa0d4b38c22fab05d468958bea0abe448097 Author: davemds Date: Sun Feb 16 13:50:20 2014 +0100 Emotion VLC backend: fix pause/stop to work again. The EM_CMD_STOP command do not have any parameter so it must be handled in the first call of the pipe. --- src/vlc/emotion_generic_vlc.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vlc/emotion_generic_vlc.c b/src/vlc/emotion_generic_vlc.c index 145833f..8c4e049 100644 --- a/src/vlc/emotion_generic_vlc.c +++ b/src/vlc/emotion_generic_vlc.c @@ -636,6 +636,10 @@ _remote_command(void *data, void *buffer, unsigned int nbyte) _file_close(app); app->last_order = EM_CMD_LAST; break; + case EM_CMD_STOP: + _stop(app); + app->last_order = EM_CMD_LAST; + break; } } else @@ -657,9 +661,6 @@ _remote_command(void *data, void *buffer, unsigned int nbyte) case EM_CMD_PLAY: _play(app, *(float*) buffer); break; - case EM_CMD_STOP: - _stop(app); - break; case EM_CMD_POSITION_SET: _position_set(app, *(float*) buffer); break; --
[EGIT] [core/emotion_generic_players] emotion_generic_players-1.8 01/01: Emotion VLC backend: fix pause/stop to work again.
davemds pushed a commit to branch emotion_generic_players-1.8. http://git.enlightenment.org/core/emotion_generic_players.git/commit/?id=f5c24d73dd95fa47c16f5a87535a90a27f7509f4 commit f5c24d73dd95fa47c16f5a87535a90a27f7509f4 Author: davemds Date: Sun Feb 16 14:07:21 2014 +0100 Emotion VLC backend: fix pause/stop to work again. The EM_CMD_STOP command do not have any parameter so it must be handled in the first call of the pipe. --- src/vlc/emotion_generic_vlc.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vlc/emotion_generic_vlc.c b/src/vlc/emotion_generic_vlc.c index 48581e5..c69b25e 100644 --- a/src/vlc/emotion_generic_vlc.c +++ b/src/vlc/emotion_generic_vlc.c @@ -634,6 +634,10 @@ _remote_command(void *data, void *buffer, unsigned int nbyte) _file_close(app); app->last_order = EM_CMD_LAST; break; + case EM_CMD_STOP: + _stop(app); + app->last_order = EM_CMD_LAST; + break; } } else @@ -655,9 +659,6 @@ _remote_command(void *data, void *buffer, unsigned int nbyte) case EM_CMD_PLAY: _play(app, *(float*) buffer); break; - case EM_CMD_STOP: - _stop(app); - break; case EM_CMD_POSITION_SET: _position_set(app, *(float*) buffer); break; --
[EGIT] [core/efl] master 01/01: Emotion generic interface: FILE_SET_DONE do not have any param.
davemds pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1a9952eca787a1ee5e384ec25933ff0987465572 commit 1a9952eca787a1ee5e384ec25933ff0987465572 Author: davemds Date: Sun Feb 16 14:13:18 2014 +0100 Emotion generic interface: FILE_SET_DONE do not have any param. --- src/modules/emotion/generic/Emotion_Generic_Plugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/emotion/generic/Emotion_Generic_Plugin.h b/src/modules/emotion/generic/Emotion_Generic_Plugin.h index f1930af..6208731 100644 --- a/src/modules/emotion/generic/Emotion_Generic_Plugin.h +++ b/src/modules/emotion/generic/Emotion_Generic_Plugin.h @@ -24,7 +24,7 @@ enum _Emotion_Generic_Cmd EM_CMD_PLAY,// param: position (float) EM_CMD_STOP,// param: none EM_CMD_FILE_SET,// param: filename (string) - EM_CMD_FILE_SET_DONE, // param: success (int) + EM_CMD_FILE_SET_DONE, // param: none EM_CMD_FILE_CLOSE, // param: none EM_CMD_POSITION_SET,// param: position (float) EM_CMD_SPEED_SET, // param: speed (float) --
[EGIT] [core/efl] master 01/02: edje: fix doxygen, to make Eolian keep silence
yakov pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=294b46654e8264452c2f0c0e21fcaf38301da920 commit 294b46654e8264452c2f0c0e21fcaf38301da920 Author: Yakov Goldberg Date: Sun Feb 16 15:40:11 2014 +0200 edje: fix doxygen, to make Eolian keep silence --- src/lib/edje/Edje_Eo.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h index f682fb2..bea6e6e 100644 --- a/src/lib/edje/Edje_Eo.h +++ b/src/lib/edje/Edje_Eo.h @@ -2258,6 +2258,7 @@ enum * @param[in] emission * @param[in] source * @param[in] func + * @param[in] data * @param[out] ret * * @see edje_object_signal_callback_del --
[EGIT] [core/efl] master 02/02: edje: fix Eo ids, to make Eolian keep silence
yakov pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a1b8e38a5c15ca7c689d9dd8e400a7ec7bc1304a
commit a1b8e38a5c15ca7c689d9dd8e400a7ec7bc1304a
Author: Yakov Goldberg
Date: Sun Feb 16 15:42:57 2014 +0200
edje: fix Eo ids, to make Eolian keep silence
---
src/lib/edje/Edje_Eo.h| 8
src/lib/edje/edje_smart.c | 8
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h
index bea6e6e..a63c966 100644
--- a/src/lib/edje/Edje_Eo.h
+++ b/src/lib/edje/Edje_Eo.h
@@ -63,8 +63,8 @@ enum
EDJE_OBJ_SUB_ID_PART_TEXT_IMF_CONTEXT_RESET,
EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_LAYOUT_SET,
EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_LAYOUT_GET,
- EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_VARIATION_SET,
- EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_VARIATION_GET,
+ EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_LAYOUT_VARIATION_SET,
+ EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_LAYOUT_VARIATION_GET,
EDJE_OBJ_SUB_ID_PART_TEXT_AUTOCAPITAL_TYPE_SET,
EDJE_OBJ_SUB_ID_PART_TEXT_AUTOCAPITAL_TYPE_GET,
EDJE_OBJ_SUB_ID_PART_TEXT_PREDICTION_ALLOW_SET,
@@ -297,7 +297,7 @@ enum
*
* @see edje_object_part_text_input_panel_variation_get
*/
-#define edje_obj_part_text_input_panel_variation_get(part, ret)
EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_VARIATION_GET),
EO_TYPECHECK(const char *, part), EO_TYPECHECK(int *, ret)
+#define edje_obj_part_text_input_panel_variation_get(part, ret)
EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_LAYOUT_VARIATION_GET),
EO_TYPECHECK(const char *, part), EO_TYPECHECK(int *, ret)
/**
* @def edje_obj_part_text_input_panel_variation_set
@@ -310,7 +310,7 @@ enum
*
* @see edje_object_part_text_input_panel_variation_get
*/
-#define edje_obj_part_text_input_panel_variation_set(part, variation)
EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_VARIATION_SET),
EO_TYPECHECK(const char *, part), EO_TYPECHECK(int, variation)
+#define edje_obj_part_text_input_panel_variation_set(part, variation)
EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_LAYOUT_VARIATION_SET),
EO_TYPECHECK(const char *, part), EO_TYPECHECK(int, variation)
/**
* @def edje_obj_part_text_autocapital_type_set
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index dff9f1c..3c204d5 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -453,8 +453,8 @@ _edje_smart_class_constructor(Eo_Class *klass)
EO_OP_FUNC(EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_PART_TEXT_IMF_CONTEXT_RESET),
_part_text_imf_context_reset),
EO_OP_FUNC(EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_LAYOUT_SET),
_part_text_input_panel_layout_set),
EO_OP_FUNC(EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_LAYOUT_GET),
_part_text_input_panel_layout_get),
-
EO_OP_FUNC(EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_VARIATION_SET),
_part_text_input_panel_layout_variation_set),
-
EO_OP_FUNC(EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_VARIATION_GET),
_part_text_input_panel_layout_variation_get),
+
EO_OP_FUNC(EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_LAYOUT_VARIATION_SET),
_part_text_input_panel_layout_variation_set),
+
EO_OP_FUNC(EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_LAYOUT_VARIATION_GET),
_part_text_input_panel_layout_variation_get),
EO_OP_FUNC(EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_PART_TEXT_AUTOCAPITAL_TYPE_SET),
_part_text_autocapital_type_set),
EO_OP_FUNC(EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_PART_TEXT_AUTOCAPITAL_TYPE_GET),
_part_text_autocapital_type_get),
EO_OP_FUNC(EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_PART_TEXT_PREDICTION_ALLOW_SET),
_part_text_prediction_allow_set),
@@ -603,8 +603,8 @@ static const Eo_Op_Description op_desc[] = {
EO_OP_DESCRIPTION(EDJE_OBJ_SUB_ID_PART_TEXT_IMF_CONTEXT_RESET, "Reset the
input method context if needed."),
EO_OP_DESCRIPTION(EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_LAYOUT_SET, "Set
the layout of the input panel."),
EO_OP_DESCRIPTION(EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_LAYOUT_GET, "Get
the layout of the input panel."),
- EO_OP_DESCRIPTION(EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_VARIATION_SET,
"Set the variation of the input panel."),
- EO_OP_DESCRIPTION(EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_VARIATION_GET,
"Get the variation of the input panel."),
+
EO_OP_DESCRIPTION(EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_LAYOUT_VARIATION_SET,
"Set the variation of the input panel."),
+
EO_OP_DESCRIPTION(EDJE_OBJ_SUB_ID_PART_TEXT_INPUT_PANEL_LAYOUT_VARIATION_GET,
"Get the variation of the input panel."),
EO_OP_DESCRIPTION(EDJE_OBJ_SUB_ID_PART_TEXT_AUTOCAPITAL_TYPE_SET, "Set
the autocapitalization type on the immodule."),
EO_OP_DESCRIPTION(EDJE_OBJ_SUB_ID_PART_TEXT_AUTOCAPITAL_TYPE_GET,
"Retrieves the autocapitalization type"),
EO_OP_DESCRIPTION(EDJE_OBJ_SUB_ID_PART_TEXT_PREDICTION_ALLOW_SET, "Set
whether the prediction is allowed
[EGIT] [core/elementary] master 02/02: test_label: marked EINA_UNUSED for unused parameters and removed unnecessary casting.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=ff6a7e8e5ea5b4a0a222d0c861ef9e5de640ece7
commit ff6a7e8e5ea5b4a0a222d0c861ef9e5de640ece7
Author: Daniel Juyung Seo
Date: Mon Feb 17 01:11:17 2014 +0900
test_label: marked EINA_UNUSED for unused parameters and removed
unnecessary casting.
This removed build warnings.
---
src/bin/test_label.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/bin/test_label.c b/src/bin/test_label.c
index 0a7c1e2..78cedd0 100644
--- a/src/bin/test_label.c
+++ b/src/bin/test_label.c
@@ -78,7 +78,7 @@ test_label(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_inf
static void
_cb_size_radio_changed(void *data, Evas_Object *obj, void *event EINA_UNUSED)
{
- Evas_Object *lb = (Evas_Object *)data;
+ Evas_Object *lb = data;
int style = elm_radio_value_get((Evas_Object *)obj);
switch (style)
{
@@ -102,7 +102,7 @@ _cb_size_radio_changed(void *data, Evas_Object *obj, void
*event EINA_UNUSED)
static void
_duration_change_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
{
- Evas_Object *lb = (Evas_Object *)data;
+ Evas_Object *lb = data;
double val = elm_slider_value_get(obj);
elm_label_slide_duration_set(lb, val);
@@ -115,7 +115,7 @@ _duration_change_cb(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
static void
_speed_change_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
{
- Evas_Object *lb = (Evas_Object *)data;
+ Evas_Object *lb = data;
double val = elm_slider_value_get(obj);
elm_label_slide_speed_set(lb, val);
@@ -126,7 +126,8 @@ _speed_change_cb(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
}
static void
-_label_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_label_resize_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
+ void *event_info EINA_UNUSED)
{
Evas_Object *speed_slider = evas_object_data_get(obj, "speed_slider");
Evas_Object *duration_slider = evas_object_data_get(obj, "duration_slider");
--
[EGIT] [core/elementary] master 01/02: index: send active signal(elm,state,active) to selected item in auto_fill
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=7cec191d13a9616bf5ec9c16e2928015196c4034
commit 7cec191d13a9616bf5ec9c16e2928015196c4034
Author: Jaeun Choi
Date: Mon Feb 17 00:54:52 2014 +0900
index: send active signal(elm,state,active) to selected item in auto_fill
Summary:
when index box is cleared and refilled, selected item's status still
remains as selected
but not highlighted. should send active signal to the selected item so that
it is highlighted.
Test Plan: None
Reviewers: Hermet, seoz
Reviewed By: seoz
Differential Revision: https://phab.enlightenment.org/D559
---
src/lib/elm_index.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 694b727..6863887 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -251,6 +251,9 @@ _index_box_auto_fill(Evas_Object *obj,
{
it->head = head;
head->omitted = eina_list_append(head->omitted, it);
+ // if it is selected but omitted, send signal to it's head
+ if (it->selected)
+edje_object_signal_emit(VIEW(it->head),
"elm,state,active", "elm");
}
continue;
}
@@ -290,6 +293,9 @@ _index_box_auto_fill(Evas_Object *obj,
evas_object_box_append(sd->bx[level], o);
stacking = edje_object_data_get(o, "stacking");
+if (it->selected)
+ edje_object_signal_emit(o, "elm,state,active", "elm");
+
if (stacking)
{
if (!strcmp(stacking, "below")) evas_object_lower(o);
--
[EGIT] [core/efl] master 01/04: Emotion test: New volume slider. More readable alpha text.
davemds pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2ed26fed596456f144700d8a45b89484bda1d16c
commit 2ed26fed596456f144700d8a45b89484bda1d16c
Author: davemds
Date: Sun Feb 16 15:32:59 2014 +0100
Emotion test: New volume slider. More readable alpha text.
---
src/tests/emotion/data/theme.edc | 67 ++-
src/tests/emotion/emotion_test_main.c | 24 ++---
2 files changed, 79 insertions(+), 12 deletions(-)
diff --git a/src/tests/emotion/data/theme.edc b/src/tests/emotion/data/theme.edc
index 0a4b1f6..2a50c09 100644
--- a/src/tests/emotion/data/theme.edc
+++ b/src/tests/emotion/data/theme.edc
@@ -647,11 +647,13 @@ collections {
//
// need txt parts:
// "video_speed_txt"
+ // "video_volume_txt"
// "video_progress_txt"
//
// need dragables:
// "video_progress" horizontal
// "video_speed" vertical
+ // "video_volume" vertical
part { name: "video_swallow"; mouse_events: 0; type: SWALLOW;
description { state: "default" 0.0;
rel1 {
@@ -735,24 +737,35 @@ collections {
part { name: "video_speed_txt"; type: TEXT; mouse_events: 0;
description { state: "default" 0.0;
rel1 {
- to: "video_frame_bottom";
- relative: 0.0 0.0;
- offset: 08;
+ to: "video_frame_top";
}
rel2 {
- to: "video_frame_bottom";
- relative: 1.0 1.0;
- offset: -1 -13;
+ to: "video_frame_top";
}
color: 0 0 0 255;
text {
- text: "Video Speed";
font: "Sans";
- size: 6;
+ size: 8;
align: 1.0 0.5;
};
}
}
+ part { name: "video_volume_txt"; type: TEXT; mouse_events: 0;
+description { state: "default" 0.0;
+ rel1 {
+ to: "video_frame_top";
+ }
+ rel2 {
+ to: "video_frame_top";
+ }
+ color: 0 0 0 255;
+ text {
+ font: "Sans";
+ size: 8;
+ align: 0.0 0.5;
+ };
+}
+ }
part { name: "video_progress_confine"; mouse_events: 0; type: RECT;
description { state: "default" 0.0;
fixed: 1 1;
@@ -851,6 +864,43 @@ collections {
}
}
}
+ part { name: "video_volume_confine"; mouse_events: 0; type: RECT;
+description { state: "default" 0.0;
+ rel1 {
+ to: "video_frame_left";
+ offset: 1024;
+ }
+ rel2 {
+ to: "video_frame_left";
+ offset: 0 -48;
+ }
+ color: 0 0 0 0;
+}
+ }
+ part { name: "video_volume"; mouse_events: 1;
+dragable {
+ x:0 0 0;
+ y:-1 1 0;
+ confine: "video_volume_confine";
+}
+description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 24 24;
+ rel1 {
+ to: "video_volume_confine";
+ relative: 0.5 0.5;
+ offset: 00;
+ }
+ rel2 {
+ to: "video_volume_confine";
+ relative: 0.5 0.5;
+ offset: 00;
+ }
+ image {
+ normal: "knob.png";
+ }
+}
+ }
part { name: "video_play"; mouse_events: 1;
description { state: "default" 0.0;
fixed: 1 1;
@@ -969,6 +1019,7 @@ collections {
// "video_control" "stop"
// "drag" "video_progress"
// "drag" "video_speed"
+ // "drag" "video_volume"
//
// get signals:
// "video_state" "play"
diff --git a/src/tests/emotion/emotion_test_main.c
b/src/tests/emotion/emotion_test_main.c
index 2323e06..c2274a4 100644
--- a/src/tests/emotion/emotion_test_main.c
+++ b/src/tests/emotion/emotion_test_main.c
@@ -511,11 +511,24 @@ video_obj_signal_speed_cb(void *data, Evas_Object *o,
const char *emission EINA_
edje_object_part_drag_value_get(o, source, &x, &y);
spd = 255 * y;
evas_object_color_set(ov, spd, spd, spd, spd);
- snprintf(buf, sizeof(buf), "%.0f", spd);
+ snprintf(buf, sizeof(buf), "alpha %.0f", spd);
edje_object_part_text_set(o, "video_speed_txt", buf);
}
static void
+video_obj_signal_vol_cb(vo
[EGIT] [core/efl] master 02/04: Emotion test: rename speed slider to alpha as it should be.
davemds pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=88c53dd2bc8280eb99feebad7a68b860e85113bd
commit 88c53dd2bc8280eb99feebad7a68b860e85113bd
Author: davemds
Date: Sun Feb 16 15:43:42 2014 +0100
Emotion test: rename speed slider to alpha as it should be.
That slider was probaly used for speed years ago, it is used for alpha now,
so call it with the right name.
---
src/tests/emotion/data/theme.edc | 37 +--
src/tests/emotion/emotion_test_main.c | 18 -
2 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/src/tests/emotion/data/theme.edc b/src/tests/emotion/data/theme.edc
index 2a50c09..c4ba3ac 100644
--- a/src/tests/emotion/data/theme.edc
+++ b/src/tests/emotion/data/theme.edc
@@ -646,13 +646,13 @@ collections {
// "video_swallow"
//
// need txt parts:
- // "video_speed_txt"
+ // "video_alpha_txt"
// "video_volume_txt"
// "video_progress_txt"
//
// need dragables:
// "video_progress" horizontal
- // "video_speed" vertical
+ // "video_alpha" vertical
// "video_volume" vertical
part { name: "video_swallow"; mouse_events: 0; type: SWALLOW;
description { state: "default" 0.0;
@@ -734,7 +734,7 @@ collections {
}
}
}
- part { name: "video_speed_txt"; type: TEXT; mouse_events: 0;
+ part { name: "video_alpha_txt"; type: TEXT; mouse_events: 0;
description { state: "default" 0.0;
rel1 {
to: "video_frame_top";
@@ -825,7 +825,7 @@ collections {
}
}
}
- part { name: "video_speed_confine"; mouse_events: 0; type: RECT;
+ part { name: "video_alpha_confine"; mouse_events: 0; type: RECT;
description { state: "default" 0.0;
rel1 {
to: "video_frame_right";
@@ -840,22 +840,22 @@ collections {
color: 0 0 0 0;
}
}
- part { name: "video_speed"; mouse_events: 1;
+ part { name: "video_alpha"; mouse_events: 1;
dragable {
x:0 0 0;
y:-1 1 0;
- confine: "video_speed_confine";
+ confine: "video_alpha_confine";
}
description { state: "default" 0.0;
fixed: 1 1;
min: 24 24;
rel1 {
- to: "video_speed_confine";
+ to: "video_alpha_confine";
relative: 0.5 0.5;
offset: 00;
}
rel2 {
- to: "video_speed_confine";
+ to: "video_alpha_confine";
relative: 0.5 0.5;
offset: 00;
}
@@ -1018,7 +1018,7 @@ collections {
// "video_control" "pause"
// "video_control" "stop"
// "drag" "video_progress"
- // "drag" "video_speed"
+ // "drag" "video_alpha"
// "drag" "video_volume"
//
// get signals:
@@ -1069,12 +1069,12 @@ collections {
// "video_swallow"
//
// need txt parts:
- // "video_speed_txt"
+ // "video_alpha_txt"
// "video_progress_txt"
//
// need dragables:
// "video_progress" horizontal
- // "video_speed" vertical
+ // "video_alpha" vertical
part { name: "video_swallow"; mouse_events: 0; type: SWALLOW;
description { state: "default" 0.0;
rel1 {
@@ -1195,7 +1195,7 @@ collections {
}
}
}
- part { name: "video_speed_txt"; type: TEXT; mouse_events: 0;
+ part { name: "video_alpha_txt"; type: TEXT; mouse_events: 0;
description { state: "default" 0.0;
rel1 {
to: "video_frame_bottom";
@@ -1209,7 +1209,6 @@ collections {
}
color: 0 0 0 255;
text {
- text: "Video Speed";
font: "Sans";
size: 6;
align: 1.0 0.5;
@@ -1275,7 +1274,7 @@ collections {
}
}
}
- part { name: "video_speed_confine"; mouse_events: 0; type: RECT;
+ part { name: "video_alpha_confine"; mouse_events: 0; type: RECT;
description { state: "default" 0.0;
rel1 {
to: "video_frame_right";
@@ -1290,22 +1289,22 @@ collections {
color: 0 0 0 0;
}
}
- part { name: "video_speed"; mouse_events: 1;
+ part { name: "video_alpha"; mouse_events: 1;
dragable {
[EGIT] [core/efl] master 04/04: Emotion test: add the volume slider also to the Reflex group.
davemds pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5e493a0851780ca42393976e24ed57c80e4d2644
commit 5e493a0851780ca42393976e24ed57c80e4d2644
Author: davemds
Date: Sun Feb 16 16:00:20 2014 +0100
Emotion test: add the volume slider also to the Reflex group.
NOTE: do we really need to maintain 2 different groups for the reflex
effect?
The 2 groups differ only for the added reflection part.
Isn't enough to show/hide the reflection part when requested?
---
src/tests/emotion/data/theme.edc | 65 +++-
1 file changed, 58 insertions(+), 7 deletions(-)
diff --git a/src/tests/emotion/data/theme.edc b/src/tests/emotion/data/theme.edc
index c4ba3ac..7172232 100644
--- a/src/tests/emotion/data/theme.edc
+++ b/src/tests/emotion/data/theme.edc
@@ -1070,11 +1070,13 @@ collections {
//
// need txt parts:
// "video_alpha_txt"
+ // "video_volume_txt"
// "video_progress_txt"
//
// need dragables:
// "video_progress" horizontal
// "video_alpha" vertical
+ // "video_volume" vertical
part { name: "video_swallow"; mouse_events: 0; type: SWALLOW;
description { state: "default" 0.0;
rel1 {
@@ -1198,23 +1200,35 @@ collections {
part { name: "video_alpha_txt"; type: TEXT; mouse_events: 0;
description { state: "default" 0.0;
rel1 {
- to: "video_frame_bottom";
- relative: 0.0 0.0;
- offset: 08;
+ to: "video_frame_top";
}
rel2 {
- to: "video_frame_bottom";
- relative: 1.0 1.0;
- offset: -1 -13;
+ to: "video_frame_top";
}
color: 0 0 0 255;
text {
font: "Sans";
- size: 6;
+ size: 8;
align: 1.0 0.5;
};
}
}
+ part { name: "video_volume_txt"; type: TEXT; mouse_events: 0;
+description { state: "default" 0.0;
+ rel1 {
+ to: "video_frame_top";
+ }
+ rel2 {
+ to: "video_frame_top";
+ }
+ color: 0 0 0 255;
+ text {
+ font: "Sans";
+ size: 8;
+ align: 0.0 0.5;
+ };
+}
+ }
part { name: "video_progress_confine"; mouse_events: 0; type: RECT;
description { state: "default" 0.0;
fixed: 1 1;
@@ -1313,6 +1327,43 @@ collections {
}
}
}
+ part { name: "video_volume_confine"; mouse_events: 0; type: RECT;
+description { state: "default" 0.0;
+ rel1 {
+ to: "video_frame_left";
+ offset: 1024;
+ }
+ rel2 {
+ to: "video_frame_left";
+ offset: 0 -48;
+ }
+ color: 0 0 0 0;
+}
+ }
+ part { name: "video_volume"; mouse_events: 1;
+dragable {
+ x:0 0 0;
+ y:-1 1 0;
+ confine: "video_volume_confine";
+}
+description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 24 24;
+ rel1 {
+ to: "video_volume_confine";
+ relative: 0.5 0.5;
+ offset: 00;
+ }
+ rel2 {
+ to: "video_volume_confine";
+ relative: 0.5 0.5;
+ offset: 00;
+ }
+ image {
+ normal: "knob.png";
+ }
+}
+ }
part { name: "video_play"; mouse_events: 1;
description { state: "default" 0.0;
fixed: 1 1;
--
[EGIT] [core/efl] master 03/04: Emotion test: Removed volume key bind. EINA_UNUSED--
davemds pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=dae8975c9906c7cebff048e8816eb3f1dfdd2998
commit dae8975c9906c7cebff048e8816eb3f1dfdd2998
Author: davemds
Date: Sun Feb 16 15:53:09 2014 +0100
Emotion test: Removed volume key bind. EINA_UNUSED--
Volume is now managed per-window, no more need for a global volume key.
---
src/tests/emotion/emotion_test_main.c | 16 +++-
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/tests/emotion/emotion_test_main.c
b/src/tests/emotion/emotion_test_main.c
index 5b105fe..f3e21ca 100644
--- a/src/tests/emotion/emotion_test_main.c
+++ b/src/tests/emotion/emotion_test_main.c
@@ -211,16 +211,6 @@ bg_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_U
broadcast_event(EMOTION_EVENT_9);
else if (!strcmp(ev->keyname, "-"))
broadcast_event(EMOTION_EVENT_10);
- else if (!strcmp(ev->keyname, "bracketleft"))
- {
-EINA_LIST_FOREACH(video_objs, l, o)
- emotion_object_audio_volume_set(o,
emotion_object_audio_volume_get(o) - 0.1);
- }
- else if (!strcmp(ev->keyname, "bracketright"))
- {
-EINA_LIST_FOREACH(video_objs, l, o)
- emotion_object_audio_volume_set(o,
emotion_object_audio_volume_get(o) + 0.1);
- }
else if (!strcmp(ev->keyname, "v"))
{
EINA_LIST_FOREACH(video_objs, l, o)
@@ -489,7 +479,7 @@ video_obj_signal_stop_cb(void *data, Evas_Object *o, const
char *emission EINA_U
}
static void
-video_obj_signal_jump_cb(void *data, Evas_Object *o, const char *emission
EINA_UNUSED, const char *source EINA_UNUSED)
+video_obj_signal_jump_cb(void *data, Evas_Object *o, const char *emission
EINA_UNUSED, const char *source)
{
Evas_Object *ov = data;
double len;
@@ -501,7 +491,7 @@ video_obj_signal_jump_cb(void *data, Evas_Object *o, const
char *emission EINA_U
}
static void
-video_obj_signal_alpha_cb(void *data, Evas_Object *o, const char *emission
EINA_UNUSED, const char *source EINA_UNUSED)
+video_obj_signal_alpha_cb(void *data, Evas_Object *o, const char *emission
EINA_UNUSED, const char *source)
{
Evas_Object *ov = data;
double alpha;
@@ -516,7 +506,7 @@ video_obj_signal_alpha_cb(void *data, Evas_Object *o, const
char *emission EINA_
}
static void
-video_obj_signal_vol_cb(void *data, Evas_Object *o, const char *emission
EINA_UNUSED, const char *source EINA_UNUSED)
+video_obj_signal_vol_cb(void *data, Evas_Object *o, const char *emission
EINA_UNUSED, const char *source)
{
Evas_Object *ov = data;
double vol;
--
[EGIT] [core/efl] master 01/01: Emotion test: no need to search for a folder that no more exists
davemds pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=690a60c3ccf1d2320628587a0da7b8d0d0ede83b
commit 690a60c3ccf1d2320628587a0da7b8d0d0ede83b
Author: davemds
Date: Sun Feb 16 19:04:13 2014 +0100
Emotion test: no need to search for a folder that no more exists
---
src/tests/emotion/emotion_test_main.c | 17 -
1 file changed, 17 deletions(-)
diff --git a/src/tests/emotion/emotion_test_main.c
b/src/tests/emotion/emotion_test_main.c
index f3e21ca..e78b50d 100644
--- a/src/tests/emotion/emotion_test_main.c
+++ b/src/tests/emotion/emotion_test_main.c
@@ -116,22 +116,6 @@ theme_get(void)
return PACKAGE_DATA_DIR"/data/theme.edj";
}
-static const char *
-fonts_dir_get(void)
-{
- static int is_local = -1;
- if (is_local == -1)
- {
-struct stat st;
-is_local = (stat(PACKAGE_BUILD_DIR"/src/tests/emotion/data/fonts",
&st) == 0);
- }
-
- if (is_local)
- return PACKAGE_BUILD_DIR"/src/tests/emotion/data/fonts";
- else
- return PACKAGE_DATA_DIR"/data/fonts";
-}
-
void
bg_setup(void)
{
@@ -766,7 +750,6 @@ main(int argc, char **argv)
evas = ecore_evas_get(ecore_evas);
evas_image_cache_set(evas, 8 * 1024 * 1024);
evas_font_cache_set(evas, 1 * 1024 * 1024);
- evas_font_path_append(evas, fonts_dir_get());
emotion_init();
--
[EGIT] [core/efl] master 01/01: Emotion test: some small cleanups
davemds pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=828e6f995d107d621964695eb45025b46b874be6
commit 828e6f995d107d621964695eb45025b46b874be6
Author: davemds
Date: Sun Feb 16 19:37:55 2014 +0100
Emotion test: some small cleanups
* simpler and stronger way to search the theme file
* removed unused verbose option
* removed unused start_time var
---
src/tests/emotion/emotion_test_main.c | 72 ---
1 file changed, 33 insertions(+), 39 deletions(-)
diff --git a/src/tests/emotion/emotion_test_main.c
b/src/tests/emotion/emotion_test_main.c
index e78b50d..56e56f7 100644
--- a/src/tests/emotion/emotion_test_main.c
+++ b/src/tests/emotion/emotion_test_main.c
@@ -31,7 +31,6 @@ static const Ecore_Getopt options = {
ECORE_GETOPT_STORE_STR('b', "backend", "backend to use"),
ECORE_GETOPT_STORE_INT('v', "vis", "visualization type"),
ECORE_GETOPT_STORE_TRUE('w', "webcams", "show all the available v4l
streams"),
- ECORE_GETOPT_COUNT('v', "verbose", "be more verbose"),
ECORE_GETOPT_STORE_TRUE('R', "reflex", "show video reflex effect"),
ECORE_GETOPT_VERSION('V', "version"),
ECORE_GETOPT_COPYRIGHT('R', "copyright"),
@@ -61,7 +60,6 @@ static void bg_key_down(void *data, Evas * e, Evas_Object *
obj, void *event_inf
static Evas_Object *o_bg = NULL;
-static double start_time = 0.0;
static Ecore_Evas *ecore_evas = NULL;
static Evas*evas = NULL;
static int startw = 800;
@@ -70,6 +68,7 @@ static int starth = 600;
static Eina_List *video_objs = NULL;
static Emotion_Vis vis= EMOTION_VIS_NONE;
static unsigned char reflex= 0;
+static const char *theme_file = NULL;
static void
main_resize(Ecore_Evas *ee)
@@ -100,29 +99,13 @@ main_delete_request(Ecore_Evas *ee EINA_UNUSED)
ecore_main_loop_quit();
}
-static const char *
-theme_get(void)
-{
- static int is_local = -1;
- if (is_local == -1)
- {
-struct stat st;
-is_local = (stat(PACKAGE_BUILD_DIR"/src/tests/emotion/data/theme.edj",
&st) == 0);
- }
-
- if (is_local)
- return PACKAGE_BUILD_DIR"/src/tests/emotion/data/theme.edj";
- else
- return PACKAGE_DATA_DIR"/data/theme.edj";
-}
-
void
bg_setup(void)
{
Evas_Object *o;
o = edje_object_add(evas);
- edje_object_file_set(o, theme_get(), "background");
+ edje_object_file_set(o, theme_file, "background");
evas_object_move(o, 0, 0);
evas_object_resize(o, startw, starth);
evas_object_layer_set(o, -999);
@@ -615,9 +598,9 @@ init_video_object(const char *module_filename, const char
*filename)
evas_object_event_callback_add(oe, EVAS_CALLBACK_FREE, _oe_free_cb, NULL);
evas_object_data_set(oe, "frame_data", fd);
if (reflex)
- edje_object_file_set(oe, theme_get(), "video_controller/reflex");
+ edje_object_file_set(oe, theme_file, "video_controller/reflex");
else
- edje_object_file_set(oe, theme_get(), "video_controller");
+ edje_object_file_set(oe, theme_file, "video_controller");
edje_extern_object_min_size_set(o, w, h);
edje_object_part_swallow(oe, "video_swallow", o);
edje_object_size_min_calc(oe, &w, &h);
@@ -683,7 +666,6 @@ main(int argc, char **argv)
Eina_Rectangle geometry = {0, 0, startw, starth};
char *engine = NULL;
char *backend = NULL;
- intverbose = 0;
Eina_Bool webcams = EINA_FALSE;
intvisual = EMOTION_VIS_NONE;
unsigned char help = 0;
@@ -695,7 +677,6 @@ main(int argc, char **argv)
ECORE_GETOPT_VALUE_STR(backend),
ECORE_GETOPT_VALUE_INT(visual),
ECORE_GETOPT_VALUE_BOOL(webcams),
- ECORE_GETOPT_VALUE_INT(verbose),
ECORE_GETOPT_VALUE_BOOL(reflex),
ECORE_GETOPT_VALUE_NONE,
ECORE_GETOPT_VALUE_NONE,
@@ -704,15 +685,29 @@ main(int argc, char **argv)
ECORE_GETOPT_VALUE_NONE
};
+ // init ecore_evas
if (!ecore_evas_init())
return -1;
+
+ // init edje
if (!edje_init())
goto shutdown_ecore_evas;
-
- start_time = ecore_time_get();
- ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, main_signal_exit, NULL);
edje_frametime_set(1.0 / 30.0);
+ // search the theme file
+ struct stat st;
+ if (stat(PACKAGE_BUILD_DIR"/src/tests/emotion/data/theme.edj", &st) == 0)
+ theme_file = PACKAGE_BUILD_DIR"/src/tests/emotion/data/theme.edj";
+ else if (stat(PACKAGE_DATA_DIR"/data/theme.edj", &st) == 0)
+ theme_file = PACKAGE_DATA_DIR"/data/theme.edj";
+ else
+ {
+printf("Cannot find the theme file\n");
+goto shutdown_edje;
+ }
+ printf("theme file: %s\n", theme_file);
+
+ // parse command line arguments
ecore_app_args_set(argc, (const char **)argv);
args = ecore_getopt_parse(&options, values, argc, argv);
if (args < 0) goto shutdown_edje;
@@ -723,25 +718,20 @@ main(int argc
[EGIT] [core/efl] master 01/01: Emotion test: no need for an animator to update the time string.
davemds pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=11e04529f8418925fc1746d03b926e0accae542b
commit 11e04529f8418925fc1746d03b926e0accae542b
Author: davemds
Date: Sun Feb 16 19:53:17 2014 +0100
Emotion test: no need for an animator to update the time string.
It is yet handled in the frame decode callback, tested with vlc,
gstreamer1, video and only audio.
---
src/tests/emotion/emotion_test_main.c | 13 -
1 file changed, 13 deletions(-)
diff --git a/src/tests/emotion/emotion_test_main.c
b/src/tests/emotion/emotion_test_main.c
index 56e56f7..ed308d5 100644
--- a/src/tests/emotion/emotion_test_main.c
+++ b/src/tests/emotion/emotion_test_main.c
@@ -647,18 +647,6 @@ init_video_object(const char *module_filename, const char
*filename)
evas_object_show(oe);
}
-static Eina_Bool
-check_positions(void *data EINA_UNUSED)
-{
- const Eina_List *lst;
- Evas_Object *o;
-
- EINA_LIST_FOREACH(video_objs, lst, o)
- video_obj_time_changed(o, evas_object_smart_parent_get(o));
-
- return !!video_objs;
-}
-
int
main(int argc, char **argv)
{
@@ -767,7 +755,6 @@ main(int argc, char **argv)
}
// start the main loop
- ecore_animator_add(check_positions, NULL);
ecore_main_loop_begin();
// shutdown
--
[EGIT] [core/efl] master 01/01: Emotion test: more cleanups
davemds pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=064307edee5d9d099655275ad325ad89828c161c
commit 064307edee5d9d099655275ad325ad89828c161c
Author: davemds
Date: Sun Feb 16 20:33:11 2014 +0100
Emotion test: more cleanups
* really free Frame_Data on EVAS_CALLBACK_FREE (data was NULL)
* place video windows with an incremental offset
---
src/tests/emotion/emotion_test_main.c | 23 ---
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/src/tests/emotion/emotion_test_main.c
b/src/tests/emotion/emotion_test_main.c
index ed308d5..8baf23d 100644
--- a/src/tests/emotion/emotion_test_main.c
+++ b/src/tests/emotion/emotion_test_main.c
@@ -564,12 +564,10 @@ static void
init_video_object(const char *module_filename, const char *filename)
{
Evas_Object *o, *oe;
- int iw, ih;
- Evas_Coord w, h;
+ Evas_Coord w, h, offset;
Frame_Data *fd;
-
-/* basic video object setup */
+ /* basic video object setup */
o = emotion_object_add(evas);
if (!emotion_object_init(o, module_filename))
return;
@@ -583,32 +581,27 @@ init_video_object(const char *module_filename, const char
*filename)
evas_object_resize(o, 320, 240);
emotion_object_smooth_scale_set(o, 1);
evas_object_show(o);
-/* end basic video setup. all the rest here is just to be fancy */
-
video_objs = eina_list_append(video_objs, o);
+ /* end basic video setup. all the rest here is just to be fancy */
- emotion_object_size_get(o, &iw, &ih);
- w = iw; h = ih;
fd = calloc(1, sizeof(Frame_Data));
if (!fd) exit(1);
-
+
oe = edje_object_add(evas);
- evas_object_event_callback_add(oe, EVAS_CALLBACK_FREE, _oe_free_cb, NULL);
+ evas_object_event_callback_add(oe, EVAS_CALLBACK_FREE, _oe_free_cb, fd);
evas_object_data_set(oe, "frame_data", fd);
if (reflex)
edje_object_file_set(oe, theme_file, "video_controller/reflex");
else
edje_object_file_set(oe, theme_file, "video_controller");
- edje_extern_object_min_size_set(o, w, h);
edje_object_part_swallow(oe, "video_swallow", o);
+
+ offset = 20 * (eina_list_count(video_objs) - 1);
+ evas_object_move(oe, offset, offset);
edje_object_size_min_calc(oe, &w, &h);
-// evas_object_move(oe, rand() % (int)(startw - w), rand() % (int)(starth -
h));
- evas_object_move(oe, 0, 0);
evas_object_resize(oe, w, h);
- edje_extern_object_min_size_set(o, 0, 0);
- edje_object_part_swallow(oe, "video_swallow", o);
evas_object_smart_callback_add(o, "frame_decode",
video_obj_frame_decode_cb, oe);
evas_object_smart_callback_add(o, "frame_resize",
video_obj_frame_resize_cb, oe);
--
[EGIT] [core/emotion_generic_players] master 01/01: Emotion VLC: cleanup: only changed function order in file.
davemds pushed a commit to branch master.
http://git.enlightenment.org/core/emotion_generic_players.git/commit/?id=345ac697dc7166189a636aceed8b508f46a7304e
commit 345ac697dc7166189a636aceed8b508f46a7304e
Author: davemds
Date: Sun Feb 16 21:38:34 2014 +0100
Emotion VLC: cleanup: only changed function order in file.
---
src/vlc/emotion_generic_vlc.c | 162 ++
1 file changed, 84 insertions(+), 78 deletions(-)
diff --git a/src/vlc/emotion_generic_vlc.c b/src/vlc/emotion_generic_vlc.c
index 8c4e049..19078ce 100644
--- a/src/vlc/emotion_generic_vlc.c
+++ b/src/vlc/emotion_generic_vlc.c
@@ -65,16 +65,11 @@ struct _App {
Eina_Bool inited;
};
-Eina_Bool
-exit_func(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev
EINA_UNUSED)
-{
- ecore_main_loop_quit();
- return EINA_TRUE;
-}
-#define SEND_CMD_PARAM(app, i) \
- if ((app)->fd_write) \
-if (!ecore_pipe_write((app)->fd_write, &(i), sizeof((i \
+/* Commands sent to the emotion pipe */
+#define SEND_CMD_PARAM(app, i) \
+ if ((app)->fd_write) \
+if (!ecore_pipe_write((app)->fd_write, &(i), sizeof((i \
ecore_main_loop_quit();
static void
@@ -200,6 +195,37 @@ _send_all_meta_info(struct _App *app)
_send_cmd_str(app, meta);
}
+static void
+_send_length_changed(struct _App *app, const struct libvlc_event_t *ev)
+{
+ float length = ev->u.media_player_length_changed.new_length;
+ length /= 1000;
+
+ _send_cmd(app, EM_RESULT_LENGTH_CHANGED);
+ SEND_CMD_PARAM(app, length);
+}
+
+static void
+_send_seekable_changed(struct _App *app, const struct libvlc_event_t *ev)
+{
+ int seekable = ev->u.media_player_seekable_changed.new_seekable;
+
+ _send_cmd(app, EM_RESULT_SEEKABLE_CHANGED);
+ SEND_CMD_PARAM(app, seekable);
+}
+
+static void
+_send_file_set(struct _App *app)
+{
+ if (app->opening)
+ _send_cmd(app, EM_RESULT_FILE_SET);
+
+ if (app->closing)
+ _send_file_closed(app);
+}
+
+
+/* libvlc */
static Eina_Bool
_loaded_idler(void *data)
{
@@ -244,35 +270,6 @@ _position_changed(App *app)
}
static void
-_send_length_changed(struct _App *app, const struct libvlc_event_t *ev)
-{
- float length = ev->u.media_player_length_changed.new_length;
- length /= 1000;
-
- _send_cmd(app, EM_RESULT_LENGTH_CHANGED);
- SEND_CMD_PARAM(app, length);
-}
-
-static void
-_send_seekable_changed(struct _App *app, const struct libvlc_event_t *ev)
-{
- int seekable = ev->u.media_player_seekable_changed.new_seekable;
-
- _send_cmd(app, EM_RESULT_SEEKABLE_CHANGED);
- SEND_CMD_PARAM(app, seekable);
-}
-
-static void
-_send_file_set(struct _App *app)
-{
- if (app->opening)
- _send_cmd(app, EM_RESULT_FILE_SET);
-
- if (app->closing)
- _send_file_closed(app);
-}
-
-static void
_event_cb(const struct libvlc_event_t *ev, void *data)
{
App *app = data;
@@ -352,9 +349,47 @@ _tmp_play(void *data EINA_UNUSED,
}
*/
+static void *
+_lock(void *data, void **pixels)
+{
+ App *app = data;
+
+ if (app->playing)
+ *pixels = app->vf.frames[app->vs->frame.player];
+ else
+ *pixels = NULL;
+
+ return NULL; // picture identifier, not needed here
+}
+
+static void
+_unlock(void *data EINA_UNUSED, void *id EINA_UNUSED, void *const *pixels
EINA_UNUSED)
+{
+}
+
+static void
+_display(void *data, void *id EINA_UNUSED)
+{
+ App *app = data;
+
+ if (!app->playing)
+ return;
+
+ eina_semaphore_lock(&app->vs->lock);
+ app->vs->frame.last = app->vs->frame.player;
+ app->vs->frame.player = app->vs->frame.next;
+ app->vs->frame.next = app->vs->frame.last;
+ if (!app->vs->frame_drop++)
+ _send_cmd(app, EM_RESULT_FRAME_NEW);
+ eina_semaphore_release(&app->vs->lock, 1);
+}
+
+
+/* Commands received from the emotion pipe */
static void
_file_set(App *app)
{
+ DBG("Path: %s", app->filename);
app->m = libvlc_media_new_path(app->libvlc, app->filename);
if (!app->m)
{
@@ -392,41 +427,6 @@ _file_set(App *app)
libvlc_media_player_play(app->mp);
}
-static void *
-_lock(void *data, void **pixels)
-{
- App *app = data;
-
- if (app->playing)
- *pixels = app->vf.frames[app->vs->frame.player];
- else
- *pixels = NULL;
-
- return NULL; // picture identifier, not needed here
-}
-
-static void
-_unlock(void *data EINA_UNUSED, void *id EINA_UNUSED, void *const *pixels
EINA_UNUSED)
-{
-}
-
-static void
-_display(void *data, void *id EINA_UNUSED)
-{
- App *app = data;
-
- if (!app->playing)
- return;
-
- eina_semaphore_lock(&app->vs->lock);
- app->vs->frame.last = app->vs->frame.player;
- app->vs->frame.player = app->vs->frame.next;
- app->vs->frame.next = app->vs->frame.last;
- if (!app->vs->frame_drop++)
- _send_cmd(app, EM_RESULT_FRAME_NEW);
- eina_semaphore_release(&app->vs->lock, 1);
-}
-
static void
_file_set_done(App *app)
{
@@ -687,11 +687,1
[EGIT] [core/emotion_generic_players] master 01/01: Emotion VLC player: debug++
davemds pushed a commit to branch master.
http://git.enlightenment.org/core/emotion_generic_players.git/commit/?id=1f2ab030bfc30a2f8abf41752182d4449b608cb5
commit 1f2ab030bfc30a2f8abf41752182d4449b608cb5
Author: davemds
Date: Sun Feb 16 22:40:36 2014 +0100
Emotion VLC player: debug++
---
src/vlc/emotion_generic_vlc.c | 32 +---
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/vlc/emotion_generic_vlc.c b/src/vlc/emotion_generic_vlc.c
index 19078ce..d0bc23e 100644
--- a/src/vlc/emotion_generic_vlc.c
+++ b/src/vlc/emotion_generic_vlc.c
@@ -50,11 +50,8 @@ struct _App {
char *shmname;
void *tmpbuffer;
int w, h;
- // Use Ecore infra for that instead
- Ecore_Pipe *fd_read; // read commands from theads here
- Ecore_Pipe *fd_write; // write commands from threads here
- /* int em_read; // read commands from emotion here */
- /* int em_write; // write commands to emotion here */
+ Ecore_Pipe *fd_read; // read commands from emotion here
+ Ecore_Pipe *fd_write; // write commands for emotion here
int size_sent;
int opening;
int closing;
@@ -278,25 +275,32 @@ _event_cb(const struct libvlc_event_t *ev, void *data)
switch (ev->type)
{
case libvlc_MediaPlayerTimeChanged:
+ DBG("libvlc_MediaPlayerTimeChanged");
_send_time_changed(app, ev);
break;
case libvlc_MediaPlayerPositionChanged:
+ DBG("libvlc_MediaPlayerPositionChanged");
_position_changed(app);
break;
case libvlc_MediaPlayerLengthChanged:
+ DBG("libvlc_MediaPlayerLengthChanged");
_send_length_changed(app, ev);
break;
case libvlc_MediaPlayerSeekableChanged:
+ DBG("libvlc_MediaPlayerSeekableChanged");
_send_seekable_changed(app, ev);
break;
case libvlc_MediaPlayerPlaying:
+ DBG("libvlc_MediaPlayerPlaying");
_send_resize(app, app->w, app->h);
_send_cmd(app, EM_RESULT_PLAYBACK_STARTED);
break;
case libvlc_MediaPlayerStopped:
+ DBG("libvlc_MediaPlayerStopped");
_send_file_set(app);
break;
case libvlc_MediaPlayerEndReached:
+ DBG("libvlc_MediaPlayerEndReached");
app->playing = 0;
_send_cmd(app, EM_RESULT_PLAYBACK_STOPPED);
break;
@@ -336,6 +340,7 @@ _tmp_format(void **opaque, char *chroma,
lines[0] = lines[1] = lines[2] = *height;
_send_resize(app, *width, *height);
+ DBG("%d %d", *width, *height);
return 1;
}
@@ -405,9 +410,10 @@ _file_set(App *app)
}
app->opening = 1;
- libvlc_video_set_format(app->mp, "RV32", DEFAULTWIDTH, DEFAULTHEIGHT,
DEFAULTWIDTH * 4);
+ libvlc_video_set_format(app->mp, "RV32", DEFAULTWIDTH, DEFAULTHEIGHT,
DEFAULTWIDTH * 4); // needed??
libvlc_video_set_callbacks(app->mp, _tmp_lock, _tmp_unlock, _tmp_display,
app);
libvlc_video_set_format_callbacks(app->mp, _tmp_format, NULL);
+
/* On my system the mute below is not working and I can't find a way
to make it work, so the following set should help, but then it has
other side effect...
@@ -420,7 +426,7 @@ _file_set(App *app)
libvlc_event_attach(app->event_mgr, libvlc_MediaPlayerStopped,
_event_cb, app);
- app->mevent_mgr = libvlc_media_event_manager(app->m);
+ app->mevent_mgr = libvlc_media_event_manager(app->m); // needed??
app->tmpbuffer = malloc(sizeof(char) * DEFAULTWIDTH * DEFAULTHEIGHT * 4);
libvlc_audio_set_mute(app->mp, 1);
@@ -432,6 +438,7 @@ _file_set_done(App *app)
{
int r;
+ DBG("Path: %s", app->filename);
app->opening = 0;
r = emotion_generic_shm_get(app->shmname, &app->vs, &app->vf);
@@ -472,6 +479,7 @@ _file_set_done(App *app)
static void
_file_close(App *app)
{
+ DBG("Path: %s", app->filename);
app->playing = 0;
if (app->opening)
goto release_resources;
@@ -499,6 +507,7 @@ release_resources:
static void
_stop(App *app)
{
+ DBG("Stop");
if (app->mp)
libvlc_media_player_set_pause(app->mp, 1);
}
@@ -506,6 +515,7 @@ _stop(App *app)
static void
_play(App *app, float pos)
{
+ DBG("Play at %.3f", pos);
if (!app->mp)
return;
@@ -531,6 +541,7 @@ _position_set(struct _App *app, float position)
{
libvlc_time_t new_time;
+ DBG("Posistion set %.3f", position);
if (!app->mp)
return;
@@ -541,6 +552,7 @@ _position_set(struct _App *app, float position)
static void
_speed_set(App *app, float rate)
{
+ DBG("Speed set %.3f", rate);
if (!app->mp)
return;
@@ -550,6 +562,7 @@ _speed_set(App *app, float rate)
static void
_mute_set(App *app, int mute)
{
+ DBG("Mute %d", mute);
if (!app->mp)
return;
@@ -561,6 +574,7 @@ _volume_set(App *app, float volume)
{
int vol;
+ DBG("Volume set %.2f", volume);
if (!app->mp)
return;
@@ -572,18 +586,21 @@ _volume_set(App *app, float volume)
static void
_spu_
[EGIT] [core/efl] master 01/01: Emotion: Add cmake definition files
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=18a7a95de371b4376b62e537ad536df116e19955
commit 18a7a95de371b4376b62e537ad536df116e19955
Author: Jean-Philippe Andre
Date: Mon Feb 17 11:28:33 2014 +0900
Emotion: Add cmake definition files
Shameless copy & paste + sed from Evas stuff
---
Makefile.am| 6 ++
cmakeconfig/EmotionConfig.cmake.in | 32
configure.ac | 2 ++
3 files changed, 40 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index b446af7..f4b6257 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -287,6 +287,12 @@ ethumbclient_cmakeconfig_DATA = \
cmakeconfig/EthumbClientConfig.cmake \
cmakeconfig/EthumbClientConfigVersion.cmake
+emotion_cmakeconfigdir = $(libdir)/cmake/Emotion/
+emotion_cmakeconfig_DATA = \
+cmakeconfig/EmotionConfig.cmake \
+cmakeconfig/EmotionConfigVersion.cmake
+
+
# D-Bus services:
servicedir = @dbusservicedir@
diff --git a/cmakeconfig/EmotionConfig.cmake.in
b/cmakeconfig/EmotionConfig.cmake.in
new file mode 100644
index 000..1b47b21
--- /dev/null
+++ b/cmakeconfig/EmotionConfig.cmake.in
@@ -0,0 +1,32 @@
+# - Try to find emotion
+# Once done this will define
+# EMOTION_FOUND - System has emotion
+# EMOTION_INCLUDE_DIRS - The emotion include directories
+# EMOTION_LIBRARIES - The libraries needed to use emotion
+# EMOTION_DEFINITIONS - Compiler switches required for using emotion
+
+set(MY_PKG emotion)
+
+find_package(PkgConfig)
+if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}"
VERSION_GREATER "2.8.1")
+ # "QUIET" was introduced in 2.8.2
+ set(_QUIET QUIET)
+endif ()
+pkg_check_modules(PC_LIBEMOTION ${_QUIET} ${MY_PKG})
+
+find_library(EMOTION_LIBRARY
+ NAMES ${PC_LIBEMOTION_LIBRARIES}
+ HINTS ${PC_LIBEMOTION_LIBDIR} ${PC_LIBEMOTION_LIBRARY_DIRS} )
+
+set(EMOTION_DEFINITIONS ${PC_LIBEMOTION_CFLAGS_OTHER})
+set(EMOTION_LIBRARIES ${EMOTION_LIBRARY})
+set(EMOTION_INCLUDE_DIRS ${PC_LIBEMOTION_INCLUDE_DIRS})
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set EMOTION_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(${MY_PKG} DEFAULT_MSG
+ EMOTION_LIBRARIES EMOTION_INCLUDE_DIRS)
+
+mark_as_advanced(EMOTION_INCLUDE_DIRS EMOTION_LIBRARY EMOTION_LIBRARIES
EMOTION_DEFINITIONS)
+
diff --git a/configure.ac b/configure.ac
index 6b7f9a2..183381d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4014,6 +4014,8 @@ cmakeconfig/EthumbConfig.cmake
cmakeconfig/EthumbConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
cmakeconfig/EthumbClientConfig.cmake
cmakeconfig/EthumbClientConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EmotionConfig.cmake
+cmakeconfig/EmotionConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
])
AC_OUTPUT
--
[EGIT] [core/enlightenment] master 01/01: randr: split config and current setup
englebass pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=60483a11a0150f17b995dcaebce0fde8142d9d76
commit 60483a11a0150f17b995dcaebce0fde8142d9d76
Author: Sebastian Dransfeld
Date: Thu Feb 13 22:44:46 2014 +0100
randr: split config and current setup
This is so the current config does get changed unless the user requests
it, and makes it possible to have several configs.
---
src/bin/e_randr.c | 845 --
src/bin/e_randr.h | 81 +++---
2 files changed, 411 insertions(+), 515 deletions(-)
diff --git a/src/bin/e_randr.c b/src/bin/e_randr.c
index 73f3b41..67f0a37 100644
--- a/src/bin/e_randr.c
+++ b/src/bin/e_randr.c
@@ -8,17 +8,17 @@
/* local function prototypes */
static Eina_Bool _e_randr_config_load(void);
static void _e_randr_config_new(void);
-static void _e_randr_config_update(void);
static void _e_randr_config_free(void);
+static void _e_randr_free(void);
static Eina_Bool _e_randr_config_cb_timer(void *data);
-static void _e_randr_config_apply(void);
-static void
_e_randr_config_output_mode_update(E_Randr_Output_Config *cfg);
-static E_Randr_Crtc_Config *_e_randr_config_crtc_new(unsigned int id);
-static void _e_randr_config_crtc_update(E_Randr_Crtc_Config
*cfg);
-static E_Randr_Output_Config *_e_randr_config_output_new(unsigned int id);
-static E_Randr_Crtc_Config *_e_randr_config_crtc_find(Ecore_X_Randr_Crtc
crtc);
-static E_Randr_Output_Config *_e_randr_config_output_find(Ecore_X_Randr_Output
output);
-static E_Randr_Crtc_Config
*_e_randr_config_output_crtc_find(E_Randr_Output_Config *cfg);
+static void _e_randr_load(void);
+static void _e_randr_apply(void);
+static void _e_randr_output_mode_update(E_Randr_Output *cfg);
+static E_Config_Randr_Output *_e_randr_config_output_new(unsigned int id);
+static E_Config_Randr_Output *_e_randr_config_output_find(Ecore_X_Randr_Output
output);
+static E_Randr_Crtc *_e_randr_crtc_find(Ecore_X_Randr_Crtc xid);
+static E_Randr_Output*_e_randr_output_find(Ecore_X_Randr_Output xid);
+static E_Randr_Crtc *_e_randr_output_crtc_find(E_Randr_Output
*output);
static void _e_randr_config_mode_geometry(Ecore_X_Randr_Orientation orient,
Eina_Rectangle *rect);
static void _e_randr_config_primary_update(void);
@@ -28,24 +28,25 @@ static Eina_Bool _e_randr_event_cb_crtc_change(void *data,
int type, void *event
static Eina_Bool _e_randr_event_cb_output_change(void *data, int type, void
*event);
static void _e_randr_acpi_handler_add(void *data);
-static int _e_randr_is_lid(E_Randr_Output_Config *cfg);
-static void _e_randr_config_outputs_from_crtc_set(E_Randr_Crtc_Config
*crtc_cfg);
-static void _e_randr_config_crtc_from_outputs_set(E_Randr_Crtc_Config
*crtc_cfg);
-static Eina_Bool _e_randr_config_lid_update(void);
+static int _e_randr_is_lid(E_Randr_Output *cfg);
+static void _e_randr_outputs_from_crtc_set(E_Randr_Crtc *crtc);
+static void _e_randr_crtc_from_outputs_set(E_Randr_Crtc *crtc);
+static Eina_Bool _e_randr_lid_update(void);
static Eina_Bool _e_randr_output_mode_valid(Ecore_X_Randr_Mode mode,
Ecore_X_Randr_Mode *modes, int nmodes);
-static void _e_randr_output_connected_set(E_Randr_Output_Config *cfg,
Eina_Bool connected);
+static void _e_randr_output_active_set(E_Randr_Output *cfg, Eina_Bool
connected);
static int _e_randr_config_output_cmp(const void *a, const void *b);
/* local variables */
static Eina_List *_randr_event_handlers = NULL;
static E_Config_DD *_e_randr_edd = NULL;
-static E_Config_DD *_e_randr_crtc_edd = NULL;
static E_Config_DD *_e_randr_output_edd = NULL;
static int _e_randr_lid_is_closed = 0;
+static E_Randr *e_randr = NULL;
+
/* external variables */
-EAPI E_Randr_Config *e_randr_cfg = NULL;
+EAPI E_Config_Randr *e_randr_cfg = NULL;
/* private internal functions */
EINTERN Eina_Bool
@@ -111,11 +112,11 @@ e_randr_shutdown(void)
E_FREE_LIST(_randr_event_handlers, ecore_event_handler_del);
/* free config */
+ _e_randr_free();
_e_randr_config_free();
/* free edd */
E_CONFIG_DD_FREE(_e_randr_output_edd);
- E_CONFIG_DD_FREE(_e_randr_crtc_edd);
E_CONFIG_DD_FREE(_e_randr_edd);
return 1;
@@ -137,10 +138,10 @@ _e_randr_config_load(void)
/* define edd for output config */
_e_randr_output_edd =
- E_CONFIG_DD_NEW("E_Randr_Output_Config", E_Randr_Output_Config);
+ E_CONFIG_DD_NEW("E_Config_Randr_Output", E_Config_Randr_Output);
#undef T
#undef D
-#define T E_Randr_Output_Config
+#define T E_Config_Randr_Output
#define D _e_randr_output_edd
E_CONFIG_VAL(D, T, xid, UINT);
E_CONFIG_VAL(D, T, crtc, UINT);
@@ -149,30 +150,17 @@ _e_randr_config_load(void)
E_CONFIG_VAL(D, T, geo.y, INT);
E_CONFIG_VAL(D, T, geo.w, INT);
E_CONFIG_VAL(D, T, geo.h, INT);
-
