summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2010-09-28 05:26:48 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2010-09-28 05:26:48 +0000
commitbcba2b261b3c0dcb0185abc7acb05999f62c88aa (patch)
treef1b71b13fc387b23dda2b915423b0e6588f84b13 /legacy/emotion
parentae6922fbd07b48cae3e9cbaf4c35d0c3e0ca9028 (diff)
emotion exports position, but don't use it from state description.
there should be some flags like RDONLY, RWONLY, RDWR, CONSTRUCTOR, RUNTIME, but until there... SVN revision: 52840
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/src/edje_external/emotion.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/legacy/emotion/src/edje_external/emotion.c b/legacy/emotion/src/edje_external/emotion.c
index 3ce02e2a8d..36ecc9c897 100644
--- a/legacy/emotion/src/edje_external/emotion.c
+++ b/legacy/emotion/src/edje_external/emotion.c
@@ -17,7 +17,7 @@ struct _External_Emotion_Params
17#define _DOUBLE(M) double M; Eina_Bool M##_exists:1 17#define _DOUBLE(M) double M; Eina_Bool M##_exists:1
18 _STR(file); 18 _STR(file);
19 _BOOL(play); 19 _BOOL(play);
20 //_DOUBLE(position); 20 _DOUBLE(position);
21 _BOOL(smooth_scale); 21 _BOOL(smooth_scale);
22 _DOUBLE(audio_volume); 22 _DOUBLE(audio_volume);
23 _BOOL(audio_mute); 23 _BOOL(audio_mute);
@@ -165,6 +165,8 @@ _external_emotion_state_set(void *data __UNUSED__, Evas_Object *obj, const void
165 _STR(file); 165 _STR(file);
166 _BOOL(play); 166 _BOOL(play);
167 //_DOUBLE(position); 167 //_DOUBLE(position);
168 if (p->position_exists)
169 WRN("position should not be set from state description! Ignored.");
168 _BOOL(smooth_scale); 170 _BOOL(smooth_scale);
169 _DOUBLE(audio_volume); 171 _DOUBLE(audio_volume);
170 _BOOL(audio_mute); 172 _BOOL(audio_mute);
@@ -232,7 +234,7 @@ _external_emotion_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_
232 if (0) {} // so else if works... 234 if (0) {} // so else if works...
233 _STR(file) 235 _STR(file)
234 _BOOL(play) 236 _BOOL(play)
235 //_DOUBLE(position) 237 _DOUBLE(position)
236 _BOOL(smooth_scale) 238 _BOOL(smooth_scale)
237 _DOUBLE(audio_volume) 239 _DOUBLE(audio_volume)
238 _BOOL(audio_mute) 240 _BOOL(audio_mute)
@@ -298,7 +300,7 @@ _external_emotion_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_
298 if (0) {} // so else if works... 300 if (0) {} // so else if works...
299 _STR(file) 301 _STR(file)
300 _BOOL(play) 302 _BOOL(play)
301 //_DOUBLE(position) 303 _DOUBLE(position)
302 _BOOL(smooth_scale) 304 _BOOL(smooth_scale)
303 _DOUBLE(audio_volume) 305 _DOUBLE(audio_volume)
304 _BOOL(audio_mute) 306 _BOOL(audio_mute)
@@ -354,7 +356,7 @@ _external_emotion_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED_
354 356
355 _STR(file); 357 _STR(file);
356 _BOOL(play); 358 _BOOL(play);
357 //_DOUBLE(position); 359 _DOUBLE(position);
358 _BOOL(smooth_scale); 360 _BOOL(smooth_scale);
359 _DOUBLE(audio_volume); 361 _DOUBLE(audio_volume);
360 _BOOL(audio_mute); 362 _BOOL(audio_mute);
@@ -386,7 +388,7 @@ _external_emotion_params_free(void *params)
386#define _DOUBLE(M) do {} while (0) 388#define _DOUBLE(M) do {} while (0)
387 _STR(file); 389 _STR(file);
388 _BOOL(play); 390 _BOOL(play);
389 //_DOUBLE(position); 391 _DOUBLE(position);
390 _BOOL(smooth_scale); 392 _BOOL(smooth_scale);
391 _DOUBLE(audio_volume); 393 _DOUBLE(audio_volume);
392 _BOOL(audio_mute); 394 _BOOL(audio_mute);
@@ -441,7 +443,7 @@ static Edje_External_Param_Info _external_emotion_params[] = {
441 ("engine", _external_emotion_engine_def, _external_emotion_engines), 443 ("engine", _external_emotion_engine_def, _external_emotion_engines),
442 EDJE_EXTERNAL_PARAM_INFO_STRING("file"), 444 EDJE_EXTERNAL_PARAM_INFO_STRING("file"),
443 EDJE_EXTERNAL_PARAM_INFO_BOOL_DEFAULT("play", EINA_FALSE), 445 EDJE_EXTERNAL_PARAM_INFO_BOOL_DEFAULT("play", EINA_FALSE),
444 //EDJE_EXTERNAL_PARAM_INFO_DOUBLE("position"), 446 EDJE_EXTERNAL_PARAM_INFO_DOUBLE("position"),
445 EDJE_EXTERNAL_PARAM_INFO_BOOL_DEFAULT("smooth_scale", EINA_FALSE), 447 EDJE_EXTERNAL_PARAM_INFO_BOOL_DEFAULT("smooth_scale", EINA_FALSE),
446 EDJE_EXTERNAL_PARAM_INFO_DOUBLE_DEFAULT("audio_volume", 0.9), 448 EDJE_EXTERNAL_PARAM_INFO_DOUBLE_DEFAULT("audio_volume", 0.9),
447 EDJE_EXTERNAL_PARAM_INFO_BOOL_DEFAULT("audio_mute", EINA_FALSE), 449 EDJE_EXTERNAL_PARAM_INFO_BOOL_DEFAULT("audio_mute", EINA_FALSE),