Initial support for Emotion as Edje EXTERNAL.

Very crude, needs testing... but I can already play videos from inside
editje and edje_player :-D



SVN revision: 47642
This commit is contained in:
Gustavo Sverzut Barbieri 2010-04-01 03:59:39 +00:00
parent f10ffca9c4
commit 6262a884fb
9 changed files with 619 additions and 16 deletions

View File

@ -108,6 +108,29 @@ PKG_CHECK_EXISTS([evas-opengl-x11], [AC_DEFINE(HAVE_EVAS_OPENGL_X11, 1, [Evas Op
PKG_CHECK_EXISTS([evas-fb], [AC_DEFINE(HAVE_EVAS_FB, 1, [Evas Framebuffer Engine Support])])
enable_edje_external="yes"
want_edje_external="auto"
AC_MSG_CHECKING([if should provide Edje EXTERNAL support...])
AC_ARG_ENABLE([edje-external],
[AC_HELP_STRING([--disable-edje-external], [disable providing Edje EXTERNAL support. @<:@default=detect@:>@])],
[want_edje_external=$enableval], [])
AC_MSG_RESULT([${enable_edje_external}])
if test "x$want_edje_external" != "xno"; then
PKG_CHECK_MODULES([EDJE_EXTERNAL],
[edje],
[enable_edje_external="yes"],
[enable_edje_external="no"]
)
else
enable_edje_external="no"
fi
if test "x$want_edje_external" = "xyes" -a "x$enable_edje_external" = "xno"; then
AC_MSG_ERROR([Edje EXTERNAL support requested, but Edje not found by pkg-config.])
fi
AM_CONDITIONAL(ENABLE_EDJE_EXTERNAL, test "x$enable_edje_external" = "xyes")
AC_SUBST(EDJE_EXTERNAL_CFLAGS)
AC_SUBST(EDJE_EXTERNAL_LIBS)
### Checks for header files
AC_HEADER_STDC
@ -174,6 +197,7 @@ src/modules/Makefile
src/modules/xine/Makefile
src/modules/gstreamer/Makefile
src/modules/vlc/Makefile
src/edje_external/Makefile
src/bin/Makefile
data/Makefile
])
@ -201,6 +225,8 @@ echo
echo " Build emotion_test...: $have_emotion_test"
echo " edje_cc..............: ${edje_cc}"
echo
echo " Edje EXTERNAL support: ${enable_edje_external}"
echo
echo "Compilation............: make (or gmake)"
echo " CPPFLAGS.............: $CPPFLAGS"
echo " CFLAGS...............: $CFLAGS"

View File

@ -4,14 +4,16 @@ MAINTAINERCLEANFILES = Makefile.in
EDJE_CC = @edje_cc@
EDJE_FLAGS = -v -id $(top_srcdir)/data -fd $(top_srcdir)/data
filesdir = $(datadir)/emotion/data
filesdir = $(datadir)/$(PACKAGE)/data
files_DATA =
if BUILD_EMOTION_TEST
files_DATA += theme.edj
endif
if ENABLE_EDJE_EXTERNAL
files_DATA += icon.edj
endif
EXTRA_DIST = \
@ -38,12 +40,18 @@ video_frame_right.png \
video_frame_top.png \
whb.png \
window_inner_shadow.png \
theme.edc
theme.edc \
icon.edc
theme.edj: Makefile
$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/theme.edc \
$(top_builddir)/data/theme.edj
icon.edj: Makefile
$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/icon.edc \
$(top_builddir)/data/icon.edj
clean-local:
rm -f *.edj

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

View File

@ -0,0 +1,14 @@
collections {
images.image: "e_logo.png" COMP;
group { name: "icon";
min: 20 10;
parts {
part { name: "icon"; type: IMAGE;
mouse_events: 0;
description { state: "default" 0.0;
image.normal: "e_logo.png";
}
}
}
}
}

View File

@ -140,6 +140,7 @@ fi
enable_[]DOWN="no"
if test "x${have_module}" = "xyes" ; then
enable_[]DOWN=${enable_module}
AC_DEFINE(EMOTION_BUILD_[]UP, 1, [Set to 1 if $1 is built])
fi
AS_IF([test "x$have_module" = "xyes"], [$3], [$4])

View File

@ -2,3 +2,7 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = lib bin modules
if ENABLE_EDJE_EXTERNAL
SUBDIRS += edje_external
endif

View File

@ -0,0 +1,17 @@
MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/src/lib \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@EMOTION_CPPFLAGS@ \
@EMOTION_CFLAGS@ \
@EFL_EMOTION_BUILD@ \
@EDJE_EXTERNAL_CFLAGS@
pkgdir = $(libdir)/edje
pkg_LTLIBRARIES = emotion.la
emotion_la_SOURCES = emotion.c
emotion_la_LIBADD = $(top_builddir)/src/lib/libemotion.la @EDJE_EXTERNAL_LIBS@
emotion_la_LDFLAGS = -no-undefined -module -avoid-version -shared -fPIC

View File

@ -0,0 +1,501 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include "Emotion.h"
#include <Edje.h>
typedef struct _External_Emotion_Params External_Emotion_Params;
typedef struct _External_Emotion_Signals_Proxy_Context External_Emotion_Signals_Proxy_Context;
struct _External_Emotion_Params
{
#define _STR(M) const char *M
#define _BOOL(M) Eina_Bool M:1; Eina_Bool M##_exists:1
#define _INT(M) int M; Eina_Bool M##_exists:1
#define _DOUBLE(M) double M; Eina_Bool M##_exists:1
_STR(file);
_BOOL(play);
//_DOUBLE(position);
_BOOL(smooth_scale);
_DOUBLE(audio_volume);
_BOOL(audio_mute);
_INT(audio_channel);
_BOOL(video_mute);
_INT(video_channel);
_BOOL(spu_mute);
_INT(spu_channel);
_INT(chapter);
_DOUBLE(play_speed);
//_INT(vis);
#undef _STR
#undef _BOOL
#undef _INT
#undef _DOUBLE
};
struct _External_Emotion_Signals_Proxy_Context
{
const char *emission;
const char *source;
Evas_Object *edje;
};
static int _log_dom = -1;
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__)
#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__)
#define DBG(...) EINA_LOG_DOM_DBG(_log_dom, __VA_ARGS__)
static const char *_external_emotion_engines[] = {
#ifdef EMOTION_BUILD_XINE
"xine",
#endif
#ifdef EMOTION_BUILD_GSTREAMER
"gstreamer",
#endif
#ifdef EMOTION_BUILD_VLC
"vlc",
#endif
NULL,
};
static const char _external_emotion_engine_def[] =
#if defined(EMOTION_BUILD_XINE)
"xine";
#elif defined(EMOTION_BUILD_GSTREAMER)
"gstreamer";
#elif defined(EMOTION_BUILD_VLC)
"vlc";
#else
NULL;
#endif
static void
_external_emotion_signal_proxy_free_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
External_Emotion_Signals_Proxy_Context *ctxt = data;
free(ctxt);
}
static void
_external_emotion_signal_proxy_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
External_Emotion_Signals_Proxy_Context *ctxt = data;
// TODO: Is it worth to check Evas_Smart_Cb_Description and do something
// TODO: with event_info given its description?
edje_object_signal_emit(ctxt->edje, ctxt->emission, ctxt->source);
}
static Evas_Object *
_external_emotion_add(void *data __UNUSED__, Evas *evas, Evas_Object *edje __UNUSED__, const Eina_List *params, const char *part_name)
{
const Evas_Smart_Cb_Description **cls_descs, **inst_descs;
unsigned int cls_count, inst_count, total;
External_Emotion_Signals_Proxy_Context *ctxt;
Evas_Object *obj;
const char *engine;
if (!edje_external_param_choice_get(params, "engine", &engine))
engine = NULL;
if (!engine) engine = _external_emotion_engine_def;
obj = emotion_object_add(evas);
if (!emotion_object_init(obj, engine))
{
ERR("failed to initialize emotion with engine '%s'.", engine);
return NULL;
}
evas_object_smart_callbacks_descriptions_get
(obj, &cls_descs, &cls_count, &inst_descs, &inst_count);
total = cls_count + inst_count;
if (!total) goto end;
ctxt = malloc(sizeof(External_Emotion_Signals_Proxy_Context) * total);
if (!ctxt) goto end;
evas_object_event_callback_add
(obj, EVAS_CALLBACK_DEL, _external_emotion_signal_proxy_free_cb, ctxt);
for (; cls_count > 0; cls_count--, cls_descs++, ctxt++)
{
const Evas_Smart_Cb_Description *d = *cls_descs;
ctxt->emission = d->name;
ctxt->source = part_name;
ctxt->edje = edje;
evas_object_smart_callback_add
(obj, d->name, _external_emotion_signal_proxy_cb, ctxt);
}
for (; inst_count > 0; inst_count--, inst_descs++, ctxt++)
{
const Evas_Smart_Cb_Description *d = *inst_descs;
ctxt->emission = d->name;
ctxt->source = part_name;
ctxt->edje = edje;
evas_object_smart_callback_add
(obj, d->name, _external_emotion_signal_proxy_cb, ctxt);
}
end:
return obj;
}
static void
_external_emotion_signal(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *signal, const char *source)
{
DBG("External Signal received: '%s' '%s'", signal, source);
}
static void
_external_emotion_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
{
const External_Emotion_Params *p;
if (to_params) p = to_params;
else if (from_params) p = from_params;
else return;
#define _STR(M) if (p->M) emotion_object_##M##_set(obj, p->M)
#define _BOOL(M) if (p->M##_exists) emotion_object_##M##_set(obj, p->M)
#define _INT(M) if (p->M##_exists) emotion_object_##M##_set(obj, p->M)
#define _DOUBLE(M) if (p->M##_exists) emotion_object_##M##_set(obj, p->M)
_STR(file);
_BOOL(play);
//_DOUBLE(position);
_BOOL(smooth_scale);
_DOUBLE(audio_volume);
_BOOL(audio_mute);
_INT(audio_channel);
_BOOL(video_mute);
_INT(video_channel);
_BOOL(spu_mute);
_INT(spu_channel);
_INT(chapter);
_DOUBLE(play_speed);
//_INT(vis);
#undef _STR
#undef _BOOL
#undef _INT
#undef _DOUBLE
}
static Eina_Bool
_external_emotion_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
{
if (!strcmp(param->name, "engine"))
{
// TODO
WRN("engine is a property that can be set only at object creation!");
return EINA_FALSE;
}
#define _STR(M) \
else if (!strcmp(param->name, #M)) \
{ \
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) \
{ \
emotion_object_##M##_set(obj, param->s); \
return EINA_TRUE; \
} \
}
#define _BOOL(M) \
else if (!strcmp(param->name, #M)) \
{ \
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) \
{ \
emotion_object_##M##_set(obj, param->i); \
return EINA_TRUE; \
} \
}
#define _INT(M) \
else if (!strcmp(param->name, #M)) \
{ \
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) \
{ \
emotion_object_##M##_set(obj, param->i); \
return EINA_TRUE; \
} \
}
#define _DOUBLE(M) \
else if (!strcmp(param->name, #M)) \
{ \
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) \
{ \
emotion_object_##M##_set(obj, param->d); \
return EINA_TRUE; \
} \
}
if (0) {} // so else if works...
_STR(file)
_BOOL(play)
//_DOUBLE(position)
_BOOL(smooth_scale)
_DOUBLE(audio_volume)
_BOOL(audio_mute)
_INT(audio_channel)
_BOOL(video_mute)
_INT(video_channel)
_BOOL(spu_mute)
_INT(spu_channel)
_INT(chapter)
_DOUBLE(play_speed)
//_INT(vis);
#undef _STR
#undef _BOOL
#undef _INT
#undef _DOUBLE
ERR("unknown parameter '%s' of type '%s'",
param->name, edje_external_param_type_str(param->type));
return EINA_FALSE;
}
static Eina_Bool
_external_emotion_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
{
#define _STR(M) \
else if (!strcmp(param->name, #M)) \
{ \
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) \
{ \
param->s = emotion_object_##M##_get(obj); \
return EINA_TRUE; \
} \
}
#define _BOOL(M) \
else if (!strcmp(param->name, #M)) \
{ \
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) \
{ \
param->i = emotion_object_##M##_get(obj); \
return EINA_TRUE; \
} \
}
#define _INT(M) \
else if (!strcmp(param->name, #M)) \
{ \
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) \
{ \
param->i = emotion_object_##M##_get(obj); \
return EINA_TRUE; \
} \
}
#define _DOUBLE(M) \
else if (!strcmp(param->name, #M)) \
{ \
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) \
{ \
param->d = emotion_object_##M##_get(obj); \
return EINA_TRUE; \
} \
}
if (0) {} // so else if works...
_STR(file)
_BOOL(play)
//_DOUBLE(position)
_BOOL(smooth_scale)
_DOUBLE(audio_volume)
_BOOL(audio_mute)
_INT(audio_channel)
_BOOL(video_mute)
_INT(video_channel)
_BOOL(spu_mute)
_INT(spu_channel)
_INT(chapter)
_DOUBLE(play_speed)
//_INT(vis)
#undef _STR
#undef _BOOL
#undef _INT
#undef _DOUBLE
ERR("unknown parameter '%s' of type '%s'",
param->name, edje_external_param_type_str(param->type));
return EINA_FALSE;
}
static void *
_external_emotion_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
{
const Edje_External_Param *param;
const Eina_List *l;
External_Emotion_Params *p = calloc(1, sizeof(External_Emotion_Params));
if (!p) return NULL;
EINA_LIST_FOREACH(params, l, param)
{
#define _STR(M) \
if (!strcmp(param->name, #M)) p->M = eina_stringshare_add(param->s)
#define _BOOL(M) \
if (!strcmp(param->name, #M)) \
{ \
p->M = param->i; \
p->M##_exists = EINA_TRUE; \
}
#define _INT(M) \
if (!strcmp(param->name, #M)) \
{ \
p->M = param->i; \
p->M##_exists = EINA_TRUE; \
}
#define _DOUBLE(M) \
if (!strcmp(param->name, #M)) \
{ \
p->M = param->d; \
p->M##_exists = EINA_TRUE; \
}
_STR(file);
_BOOL(play);
//_DOUBLE(position);
_BOOL(smooth_scale);
_DOUBLE(audio_volume);
_BOOL(audio_mute);
_INT(audio_channel);
_BOOL(video_mute);
_INT(video_channel);
_BOOL(spu_mute);
_INT(spu_channel);
_INT(chapter);
_DOUBLE(play_speed);
//_INT(vis);
#undef _STR
#undef _BOOL
#undef _INT
#undef _DOUBLE
}
return p;
}
static void
_external_emotion_params_free(void *params)
{
External_Emotion_Params *p = params;
#define _STR(M) eina_stringshare_del(p->M)
#define _BOOL(M) do {} while (0)
#define _INT(M) do {} while (0)
#define _DOUBLE(M) do {} while (0)
_STR(file);
_BOOL(play);
//_DOUBLE(position);
_BOOL(smooth_scale);
_DOUBLE(audio_volume);
_BOOL(audio_mute);
_INT(audio_channel);
_BOOL(video_mute);
_INT(video_channel);
_BOOL(spu_mute);
_INT(spu_channel);
_INT(chapter);
_DOUBLE(play_speed);
//_INT(vis);
#undef _STR
#undef _BOOL
#undef _INT
#undef _DOUBLE
free(p);
}
static const char *
_external_emotion_label_get(void *data __UNUSED__)
{
return "Emotion";
}
static Evas_Object *
_external_emotion_icon_add(void *data __UNUSED__, Evas *e)
{
Evas_Object *ic;
int w = 0, h = 0;
ic = edje_object_add(e);
edje_object_file_set(ic, PACKAGE_DATA_DIR"/data/icon.edj", "icon");
edje_object_size_min_get(ic, &w, &h);
if (w < 1) w = 20;
if (h < 1) h = 10;
evas_object_size_hint_min_set(ic, w, h);
evas_object_size_hint_max_set(ic, w, h);
return ic;
}
static const char *
_external_emotion_translate(void *data __UNUSED__, const char *orig)
{
// in future, mark all params as translatable and use dgettext()
// with "emotion" text domain here.
return orig;
}
static Edje_External_Param_Info _external_emotion_params[] = {
EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL
("engine", _external_emotion_engine_def, _external_emotion_engines),
EDJE_EXTERNAL_PARAM_INFO_STRING("file"),
EDJE_EXTERNAL_PARAM_INFO_BOOL_DEFAULT("play", EINA_FALSE),
//EDJE_EXTERNAL_PARAM_INFO_DOUBLE("position"),
EDJE_EXTERNAL_PARAM_INFO_BOOL_DEFAULT("smooth_scale", EINA_FALSE),
EDJE_EXTERNAL_PARAM_INFO_DOUBLE_DEFAULT("audio_volume", 0.9),
EDJE_EXTERNAL_PARAM_INFO_BOOL_DEFAULT("audio_mute", EINA_FALSE),
EDJE_EXTERNAL_PARAM_INFO_INT_DEFAULT("audio_channel", 0),
EDJE_EXTERNAL_PARAM_INFO_BOOL_DEFAULT("video_mute", EINA_FALSE),
EDJE_EXTERNAL_PARAM_INFO_INT_DEFAULT("video_channel", 0),
EDJE_EXTERNAL_PARAM_INFO_BOOL_DEFAULT("spu_mute", EINA_FALSE),
EDJE_EXTERNAL_PARAM_INFO_INT_DEFAULT("spu_channel", 0),
EDJE_EXTERNAL_PARAM_INFO_INT("chapter"),
EDJE_EXTERNAL_PARAM_INFO_DOUBLE_DEFAULT("play_speed", 1.0),
//EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("vis", ...),
EDJE_EXTERNAL_PARAM_INFO_SENTINEL
};
static const Edje_External_Type _external_emotion_type = {
.abi_version = EDJE_EXTERNAL_TYPE_ABI_VERSION,
.module = "emotion",
.module_name = "Emotion",
.add = _external_emotion_add,
.state_set = _external_emotion_state_set,
.signal_emit = _external_emotion_signal,
.param_set = _external_emotion_param_set,
.param_get = _external_emotion_param_get,
.params_parse = _external_emotion_params_parse,
.params_free = _external_emotion_params_free,
.label_get = _external_emotion_label_get,
.description_get = NULL,
.icon_add = _external_emotion_icon_add,
.preview_add = NULL,
.translate = _external_emotion_translate,
.parameters_info = _external_emotion_params,
.data = NULL
};
static Edje_External_Type_Info _external_emotion_types[] =
{
{"emotion", &_external_emotion_type},
{NULL, NULL}
};
static Eina_Bool
external_emotion_mod_init(void)
{
_log_dom = eina_log_domain_register
("emotion-externals", EINA_COLOR_LIGHTBLUE);
edje_external_type_array_register(_external_emotion_types);
return EINA_TRUE;
}
static void
external_emotion_mod_shutdown(void)
{
edje_external_type_array_unregister(_external_emotion_types);
eina_log_domain_unregister(_log_dom);
_log_dom = -1;
}
EINA_MODULE_INIT(external_emotion_mod_init);
EINA_MODULE_SHUTDOWN(external_emotion_mod_shutdown);

View File

@ -94,6 +94,37 @@ static const char *_backend_priority[] = {
"vlc"
};
static const char SIG_FRAME_DECODE[] = "frame_decode";
static const char SIG_POSITION_UPDATE[] = "position_update";
static const char SIG_LENGTH_CHANGE[] = "length_change";
static const char SIG_FRAME_RESIZE[] = "frame_resize";
static const char SIG_DECODE_STOP[] = "decode_stop";
static const char SIG_PLAYBACK_FINISHED[] = "playback_finished";
static const char SIG_AUDIO_LEVEL_CHANGE[] = "audio_level_change";
static const char SIG_CHANNELS_CHANGE[] = "channels_change";
static const char SIG_TITLE_CHANGE[] = "title_change";
static const char SIG_PROGRESS_CHANGE[] = "progress_change";
static const char SIG_REF_CHANGE[] = "ref_change";
static const char SIG_BUTTON_NUM_CHANGE[] = "button_num_change";
static const char SIG_BUTTON_CHANGE[] = "button_change";
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_FRAME_DECODE, ""},
{SIG_POSITION_UPDATE, ""},
{SIG_LENGTH_CHANGE, ""},
{SIG_FRAME_RESIZE, ""},
{SIG_DECODE_STOP, ""},
{SIG_PLAYBACK_FINISHED, ""},
{SIG_AUDIO_LEVEL_CHANGE, ""},
{SIG_CHANNELS_CHANGE, ""},
{SIG_TITLE_CHANGE, ""},
{SIG_PROGRESS_CHANGE, ""},
{SIG_REF_CHANGE, ""},
{SIG_BUTTON_NUM_CHANGE, ""},
{SIG_BUTTON_CHANGE, ""},
{NULL, NULL}
};
EAPI Eina_Bool
_emotion_module_register(const char *name, Emotion_Module_Open open, Emotion_Module_Close close)
{
@ -905,7 +936,7 @@ _emotion_frame_new(Evas_Object *obj)
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
// printf("pix get set 1 %p\n", sd->obj);
evas_object_image_pixels_dirty_set(sd->obj, 1);
evas_object_smart_callback_call(obj, "frame_decode", NULL);
evas_object_smart_callback_call(obj, SIG_FRAME_DECODE, NULL);
}
EAPI void
@ -919,8 +950,8 @@ _emotion_video_pos_update(Evas_Object *obj, double pos, double len)
if (len != sd->len) nlen = 1;
sd->pos = pos;
sd->len = len;
if (npos) evas_object_smart_callback_call(obj, "position_update", NULL);
if (nlen) evas_object_smart_callback_call(obj, "length_change", NULL);
if (npos) evas_object_smart_callback_call(obj, SIG_POSITION_UPDATE, NULL);
if (nlen) evas_object_smart_callback_call(obj, SIG_LENGTH_CHANGE, NULL);
}
EAPI void
@ -944,7 +975,7 @@ _emotion_frame_resize(Evas_Object *obj, int w, int h, double ratio)
sd->ratio = ratio;
changed = 1;
}
if (changed) evas_object_smart_callback_call(obj, "frame_resize", NULL);
if (changed) evas_object_smart_callback_call(obj, SIG_FRAME_RESIZE, NULL);
}
EAPI void
@ -956,20 +987,20 @@ _emotion_decode_stop(Evas_Object *obj)
if (sd->play)
{
sd->play = 0;
evas_object_smart_callback_call(obj, "decode_stop", NULL);
evas_object_smart_callback_call(obj, SIG_DECODE_STOP, NULL);
}
}
EAPI void
_emotion_playback_finished(Evas_Object *obj)
{
evas_object_smart_callback_call(obj, "playback_finished", NULL);
evas_object_smart_callback_call(obj, SIG_PLAYBACK_FINISHED, NULL);
}
EAPI void
_emotion_audio_level_change(Evas_Object *obj)
{
evas_object_smart_callback_call(obj, "audio_level_change", NULL);
evas_object_smart_callback_call(obj, SIG_AUDIO_LEVEL_CHANGE, NULL);
}
EAPI void
@ -978,7 +1009,7 @@ _emotion_channels_change(Evas_Object *obj)
Smart_Data *sd;
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
evas_object_smart_callback_call(obj, "channels_change", NULL);
evas_object_smart_callback_call(obj, SIG_CHANNELS_CHANGE, NULL);
}
EAPI void
@ -989,7 +1020,7 @@ _emotion_title_set(Evas_Object *obj, char *title)
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
free(sd->title);
sd->title = strdup(title);
evas_object_smart_callback_call(obj, "title_change", NULL);
evas_object_smart_callback_call(obj, SIG_TITLE_CHANGE, NULL);
}
EAPI void
@ -1001,7 +1032,7 @@ _emotion_progress_set(Evas_Object *obj, char *info, double stat)
free(sd->progress.info);
sd->progress.info = strdup(info);
sd->progress.stat = stat;
evas_object_smart_callback_call(obj, "progress_change", NULL);
evas_object_smart_callback_call(obj, SIG_PROGRESS_CHANGE, NULL);
}
EAPI void
@ -1013,7 +1044,7 @@ _emotion_file_ref_set(Evas_Object *obj, const char *file, int num)
free(sd->ref.file);
sd->ref.file = strdup(file);
sd->ref.num = num;
evas_object_smart_callback_call(obj, "ref_change", NULL);
evas_object_smart_callback_call(obj, SIG_REF_CHANGE, NULL);
}
EAPI void
@ -1023,7 +1054,7 @@ _emotion_spu_button_num_set(Evas_Object *obj, int num)
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
sd->spu.button_num = num;
evas_object_smart_callback_call(obj, "button_num_change", NULL);
evas_object_smart_callback_call(obj, SIG_BUTTON_NUM_CHANGE, NULL);
}
EAPI void
@ -1033,7 +1064,7 @@ _emotion_spu_button_set(Evas_Object *obj, int button)
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
sd->spu.button = button;
evas_object_smart_callback_call(obj, "button_change", NULL);
evas_object_smart_callback_call(obj, SIG_BUTTON_CHANGE, NULL);
}
@ -1277,6 +1308,7 @@ _smart_init(void)
sc.color_set = _smart_color_set;
sc.clip_set = _smart_clip_set;
sc.clip_unset = _smart_clip_unset;
sc.callbacks = _smart_callbacks;
}
smart = evas_smart_class_new(&sc);
}