davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=728ff202e4668818e5e285de466ae1590e3c71a6
commit 728ff202e4668818e5e285de466ae1590e3c71a6 Author: Dave Andreoli <[email protected]> Date: Sun Jan 4 22:12:08 2015 +0100 New style enums for emotion --- efl/emotion/efl.emotion.pyx | 81 ----------------------------------------- include/efl.emotion.pxd | 87 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 81 deletions(-) diff --git a/efl/emotion/efl.emotion.pyx b/efl/emotion/efl.emotion.pyx index 5162891..27a75f5 100644 --- a/efl/emotion/efl.emotion.pyx +++ b/efl/emotion/efl.emotion.pyx @@ -25,87 +25,6 @@ from efl.evas cimport Canvas, evas_object_smart_callback_add, \ evas_object_smart_callback_del -# Emotion_Event: -EMOTION_EVENT_MENU1 = 0 -EMOTION_EVENT_MENU2 = 1 -EMOTION_EVENT_MENU3 = 2 -EMOTION_EVENT_MENU4 = 3 -EMOTION_EVENT_MENU5 = 4 -EMOTION_EVENT_MENU6 = 5 -EMOTION_EVENT_MENU7 = 6 -EMOTION_EVENT_UP = 7 -EMOTION_EVENT_DOWN = 8 -EMOTION_EVENT_LEFT = 9 -EMOTION_EVENT_RIGHT = 10 -EMOTION_EVENT_SELECT = 11 -EMOTION_EVENT_NEXT = 12 -EMOTION_EVENT_PREV = 13 -EMOTION_EVENT_ANGLE_NEXT = 14 -EMOTION_EVENT_ANGLE_PREV = 15 -EMOTION_EVENT_FORCE = 16 -EMOTION_EVENT_0 = 17 -EMOTION_EVENT_1 = 18 -EMOTION_EVENT_2 = 19 -EMOTION_EVENT_3 = 20 -EMOTION_EVENT_4 = 21 -EMOTION_EVENT_5 = 22 -EMOTION_EVENT_6 = 23 -EMOTION_EVENT_7 = 24 -EMOTION_EVENT_8 = 25 -EMOTION_EVENT_9 = 26 -EMOTION_EVENT_10 = 27 - -# Emotion_Meta_Info: -EMOTION_META_INFO_TRACK_TITLE = 0 -EMOTION_META_INFO_TRACK_ARTIST = 1 -EMOTION_META_INFO_TRACK_ALBUM = 2 -EMOTION_META_INFO_TRACK_YEAR = 3 -EMOTION_META_INFO_TRACK_GENRE = 4 -EMOTION_META_INFO_TRACK_COMMENT = 5 -EMOTION_META_INFO_TRACK_DISC_ID = 6 -EMOTION_META_INFO_TRACK_COUNT = 7 - -# Emotion_Channel_Settings: -EMOTION_CHANNEL_AUTO = -1 -EMOTION_CHANNEL_DEFAULT = 0 - -# Emotion_Aspect: -EMOTION_ASPECT_KEEP_NONE = 0 -EMOTION_ASPECT_KEEP_WIDTH = 1 -EMOTION_ASPECT_KEEP_HEIGHT = 2 -EMOTION_ASPECT_KEEP_BOTH = 3 -EMOTION_ASPECT_CROP = 4 -EMOTION_ASPECT_CUSTOM = 5 - -# Emotion_Suspend: -EMOTION_WAKEUP = 0 -EMOTION_SLEEP = 1 -EMOTION_DEEP_SLEEP = 2 -EMOTION_HIBERNATE = 3 - -# Emotion_Vis: -EMOTION_VIS_NONE = 0 -EMOTION_VIS_GOOM = 1 -EMOTION_VIS_LIBVISUAL_BUMPSCOPE = 2 -EMOTION_VIS_LIBVISUAL_CORONA = 3 -EMOTION_VIS_LIBVISUAL_DANCING_PARTICLES = 4 -EMOTION_VIS_LIBVISUAL_GDKPIXBUF = 5 -EMOTION_VIS_LIBVISUAL_G_FORCE = 6 -EMOTION_VIS_LIBVISUAL_GOOM = 7 -EMOTION_VIS_LIBVISUAL_INFINITE = 8 -EMOTION_VIS_LIBVISUAL_JAKDAW = 9 -EMOTION_VIS_LIBVISUAL_JESS = 10 -EMOTION_VIS_LIBVISUAL_LV_ANALYSER = 11 -EMOTION_VIS_LIBVISUAL_LV_FLOWER = 12 -EMOTION_VIS_LIBVISUAL_LV_GLTEST = 13 -EMOTION_VIS_LIBVISUAL_LV_SCOPE = 14 -EMOTION_VIS_LIBVISUAL_MADSPIN = 15 -EMOTION_VIS_LIBVISUAL_NEBULUS = 16 -EMOTION_VIS_LIBVISUAL_OINKSIE = 17 -EMOTION_VIS_LIBVISUAL_PLASMA = 18 -EMOTION_VIS_LAST = 19 - - cdef void _emotion_callback(void *data, Evas_Object *o, void *ei) with gil: cdef Emotion obj cdef object event diff --git a/include/efl.emotion.pxd b/include/efl.emotion.pxd index 689dada..64da669 100644 --- a/include/efl.emotion.pxd +++ b/include/efl.emotion.pxd @@ -21,24 +21,111 @@ from efl.evas cimport Object as evasObject cdef extern from "Emotion.h": + #################################################################### + # Define + # + cpdef enum: + EMOTION_CHANNEL_AUTO + EMOTION_CHANNEL_DEFAULT + + #################################################################### + # Enums + # + cpdef enum Emotion_Event: + EMOTION_EVENT_MENU1 + EMOTION_EVENT_MENU2 + EMOTION_EVENT_MENU3 + EMOTION_EVENT_MENU4 + EMOTION_EVENT_MENU5 + EMOTION_EVENT_MENU6 + EMOTION_EVENT_MENU7 + EMOTION_EVENT_UP + EMOTION_EVENT_DOWN + EMOTION_EVENT_LEFT + EMOTION_EVENT_RIGHT + EMOTION_EVENT_SELECT + EMOTION_EVENT_NEXT + EMOTION_EVENT_PREV + EMOTION_EVENT_ANGLE_NEXT + EMOTION_EVENT_ANGLE_PREV + EMOTION_EVENT_FORCE + EMOTION_EVENT_0 + EMOTION_EVENT_1 + EMOTION_EVENT_2 + EMOTION_EVENT_3 + EMOTION_EVENT_4 + EMOTION_EVENT_5 + EMOTION_EVENT_6 + EMOTION_EVENT_7 + EMOTION_EVENT_8 + EMOTION_EVENT_9 + EMOTION_EVENT_10 ctypedef enum Emotion_Event: pass + cpdef enum Emotion_Meta_Info: + EMOTION_META_INFO_TRACK_TITLE + EMOTION_META_INFO_TRACK_ARTIST + EMOTION_META_INFO_TRACK_ALBUM + EMOTION_META_INFO_TRACK_YEAR + EMOTION_META_INFO_TRACK_GENRE + EMOTION_META_INFO_TRACK_COMMENT + EMOTION_META_INFO_TRACK_DISC_ID + EMOTION_META_INFO_TRACK_COUNT ctypedef enum Emotion_Meta_Info: pass + cpdef enum Emotion_Aspect: + EMOTION_ASPECT_KEEP_NONE + EMOTION_ASPECT_KEEP_WIDTH + EMOTION_ASPECT_KEEP_HEIGHT + EMOTION_ASPECT_KEEP_BOTH + EMOTION_ASPECT_CROP + EMOTION_ASPECT_CUSTOM ctypedef enum Emotion_Aspect: pass + cpdef enum Emotion_Suspend: + EMOTION_WAKEUP + EMOTION_SLEEP + EMOTION_DEEP_SLEEP + EMOTION_HIBERNATE ctypedef enum Emotion_Suspend: pass + cpdef enum Emotion_Vis: + EMOTION_VIS_NONE + EMOTION_VIS_GOOM + EMOTION_VIS_LIBVISUAL_BUMPSCOPE + EMOTION_VIS_LIBVISUAL_CORONA + EMOTION_VIS_LIBVISUAL_DANCING_PARTICLES + EMOTION_VIS_LIBVISUAL_GDKPIXBUF + EMOTION_VIS_LIBVISUAL_G_FORCE + EMOTION_VIS_LIBVISUAL_GOOM + EMOTION_VIS_LIBVISUAL_INFINITE + EMOTION_VIS_LIBVISUAL_JAKDAW + EMOTION_VIS_LIBVISUAL_JESS + EMOTION_VIS_LIBVISUAL_LV_ANALYSER + EMOTION_VIS_LIBVISUAL_LV_FLOWER + EMOTION_VIS_LIBVISUAL_LV_GLTEST + EMOTION_VIS_LIBVISUAL_LV_SCOPE + EMOTION_VIS_LIBVISUAL_MADSPIN + EMOTION_VIS_LIBVISUAL_NEBULUS + EMOTION_VIS_LIBVISUAL_OINKSIE + EMOTION_VIS_LIBVISUAL_PLASMA + EMOTION_VIS_LAST ctypedef enum Emotion_Vis: pass + #################################################################### + # Structs + # ctypedef struct Emotion_Webcam: pass + #################################################################### + # Functions + # Eina_Bool emotion_init() Eina_Bool emotion_shutdown() --
