diff options
Diffstat (limited to '')
-rw-r--r-- | libraries/edje/src/bin/edje_cc_handlers.c | 129 |
1 files changed, 66 insertions, 63 deletions
diff --git a/libraries/edje/src/bin/edje_cc_handlers.c b/libraries/edje/src/bin/edje_cc_handlers.c index 8bfc262..f74fa12 100644 --- a/libraries/edje/src/bin/edje_cc_handlers.c +++ b/libraries/edje/src/bin/edje_cc_handlers.c | |||
@@ -172,6 +172,7 @@ static void st_collections_group_parts_part_description_visible(void); | |||
172 | static void st_collections_group_parts_part_description_align(void); | 172 | static void st_collections_group_parts_part_description_align(void); |
173 | static void st_collections_group_parts_part_description_fixed(void); | 173 | static void st_collections_group_parts_part_description_fixed(void); |
174 | static void st_collections_group_parts_part_description_min(void); | 174 | static void st_collections_group_parts_part_description_min(void); |
175 | static void st_collections_group_parts_part_description_minmul(void); | ||
175 | static void st_collections_group_parts_part_description_max(void); | 176 | static void st_collections_group_parts_part_description_max(void); |
176 | static void st_collections_group_parts_part_description_step(void); | 177 | static void st_collections_group_parts_part_description_step(void); |
177 | static void st_collections_group_parts_part_description_aspect(void); | 178 | static void st_collections_group_parts_part_description_aspect(void); |
@@ -261,12 +262,9 @@ static void st_collections_group_programs_program_after(void); | |||
261 | static void st_collections_group_programs_program_api(void); | 262 | static void st_collections_group_programs_program_api(void); |
262 | 263 | ||
263 | static void ob_collections_group_programs_program_script(void); | 264 | static void ob_collections_group_programs_program_script(void); |
264 | |||
265 | #ifdef ENABLE_MULTISENSE | ||
266 | static void st_collections_group_sound_sample_name(void); | 265 | static void st_collections_group_sound_sample_name(void); |
267 | static void st_collections_group_sound_sample_source(void); | 266 | static void st_collections_group_sound_sample_source(void); |
268 | static void st_collections_group_sound_tone(void); | 267 | static void st_collections_group_sound_tone(void); |
269 | #endif | ||
270 | 268 | ||
271 | /*****/ | 269 | /*****/ |
272 | 270 | ||
@@ -305,14 +303,13 @@ New_Statement_Handler statement_handlers[] = | |||
305 | {"collections.color_classes.color_class.color", st_color_class_color}, /* dup */ | 303 | {"collections.color_classes.color_class.color", st_color_class_color}, /* dup */ |
306 | {"collections.color_classes.color_class.color2", st_color_class_color2}, /* dup */ | 304 | {"collections.color_classes.color_class.color2", st_color_class_color2}, /* dup */ |
307 | {"collections.color_classes.color_class.color3", st_color_class_color3}, /* dup */ | 305 | {"collections.color_classes.color_class.color3", st_color_class_color3}, /* dup */ |
308 | #ifdef ENABLE_MULTISENSE | 306 | |
309 | {"collections.sounds.sample.name", st_collections_group_sound_sample_name}, | 307 | {"collections.sounds.sample.name", st_collections_group_sound_sample_name}, |
310 | {"collections.sounds.sample.source", st_collections_group_sound_sample_source}, | 308 | {"collections.sounds.sample.source", st_collections_group_sound_sample_source}, |
311 | {"collections.group.sounds.sample.name", st_collections_group_sound_sample_name}, /* dup */ | 309 | {"collections.group.sounds.sample.name", st_collections_group_sound_sample_name}, /* dup */ |
312 | {"collections.group.sounds.sample.source", st_collections_group_sound_sample_source}, /* dup */ | 310 | {"collections.group.sounds.sample.source", st_collections_group_sound_sample_source}, /* dup */ |
313 | {"collections.sounds.tone", st_collections_group_sound_tone}, | 311 | {"collections.sounds.tone", st_collections_group_sound_tone}, |
314 | {"collections.group.sounds.tone", st_collections_group_sound_tone}, /* dup */ | 312 | {"collections.group.sounds.tone", st_collections_group_sound_tone}, /* dup */ |
315 | #endif | ||
316 | {"collections.group.name", st_collections_group_name}, | 313 | {"collections.group.name", st_collections_group_name}, |
317 | {"collections.group.inherit", st_collections_group_inherit}, | 314 | {"collections.group.inherit", st_collections_group_inherit}, |
318 | {"collections.group.script_only", st_collections_group_script_only}, | 315 | {"collections.group.script_only", st_collections_group_script_only}, |
@@ -438,6 +435,7 @@ New_Statement_Handler statement_handlers[] = | |||
438 | {"collections.group.parts.part.description.align", st_collections_group_parts_part_description_align}, | 435 | {"collections.group.parts.part.description.align", st_collections_group_parts_part_description_align}, |
439 | {"collections.group.parts.part.description.fixed", st_collections_group_parts_part_description_fixed}, | 436 | {"collections.group.parts.part.description.fixed", st_collections_group_parts_part_description_fixed}, |
440 | {"collections.group.parts.part.description.min", st_collections_group_parts_part_description_min}, | 437 | {"collections.group.parts.part.description.min", st_collections_group_parts_part_description_min}, |
438 | {"collections.group.parts.part.description.minmul", st_collections_group_parts_part_description_minmul}, | ||
441 | {"collections.group.parts.part.description.max", st_collections_group_parts_part_description_max}, | 439 | {"collections.group.parts.part.description.max", st_collections_group_parts_part_description_max}, |
442 | {"collections.group.parts.part.description.step", st_collections_group_parts_part_description_step}, | 440 | {"collections.group.parts.part.description.step", st_collections_group_parts_part_description_step}, |
443 | {"collections.group.parts.part.description.aspect", st_collections_group_parts_part_description_aspect}, | 441 | {"collections.group.parts.part.description.aspect", st_collections_group_parts_part_description_aspect}, |
@@ -677,14 +675,13 @@ New_Object_Handler object_handlers[] = | |||
677 | {"collections.styles.style", ob_styles_style}, /* dup */ | 675 | {"collections.styles.style", ob_styles_style}, /* dup */ |
678 | {"collections.color_classes", NULL}, /* dup */ | 676 | {"collections.color_classes", NULL}, /* dup */ |
679 | {"collections.color_classes.color_class", ob_color_class}, /* dup */ | 677 | {"collections.color_classes.color_class", ob_color_class}, /* dup */ |
680 | #ifdef ENABLE_MULTISENSE | ||
681 | {"collections.sounds", NULL}, | 678 | {"collections.sounds", NULL}, |
682 | {"collections.group.sounds", NULL}, /* dup */ | 679 | {"collections.group.sounds", NULL}, /* dup */ |
683 | {"collections.sounds.sample", NULL}, | 680 | {"collections.sounds.sample", NULL}, |
684 | {"collections.group.sounds.sample", NULL}, /* dup */ | 681 | {"collections.group.sounds.sample", NULL}, /* dup */ |
685 | #endif | ||
686 | {"collections.group", ob_collections_group}, | 682 | {"collections.group", ob_collections_group}, |
687 | {"collections.group.data", NULL}, | 683 | {"collections.group.data", NULL}, |
684 | {"collections.group.limits", NULL}, | ||
688 | {"collections.group.script", ob_collections_group_script}, | 685 | {"collections.group.script", ob_collections_group_script}, |
689 | {"collections.group.lua_script", ob_collections_group_lua_script}, | 686 | {"collections.group.lua_script", ob_collections_group_lua_script}, |
690 | {"collections.group.externals", NULL}, /* dup */ | 687 | {"collections.group.externals", NULL}, /* dup */ |
@@ -1836,12 +1833,6 @@ st_styles_style_tag(void) | |||
1836 | stl->tags = eina_list_append(stl->tags, tag); | 1833 | stl->tags = eina_list_append(stl->tags, tag); |
1837 | } | 1834 | } |
1838 | 1835 | ||
1839 | #ifdef ENABLE_MULTISENSE | ||
1840 | /* add to below doc | ||
1841 | sounds { } | ||
1842 | */ | ||
1843 | #endif | ||
1844 | |||
1845 | /** | 1836 | /** |
1846 | @page edcref | 1837 | @page edcref |
1847 | @block | 1838 | @block |
@@ -1851,6 +1842,7 @@ sounds { } | |||
1851 | .. | 1842 | .. |
1852 | group { } | 1843 | group { } |
1853 | group { } | 1844 | group { } |
1845 | sounds { } | ||
1854 | .. | 1846 | .. |
1855 | } | 1847 | } |
1856 | @description | 1848 | @description |
@@ -1866,8 +1858,7 @@ ob_collections(void) | |||
1866 | edje_file->collection = eina_hash_string_small_new(NULL); | 1858 | edje_file->collection = eina_hash_string_small_new(NULL); |
1867 | } | 1859 | } |
1868 | 1860 | ||
1869 | #ifdef ENABLE_MULTISENSE | 1861 | /** |
1870 | /* * delete space before * | ||
1871 | @page edcref | 1862 | @page edcref |
1872 | @block | 1863 | @block |
1873 | sounds | 1864 | sounds |
@@ -1980,7 +1971,7 @@ st_collections_group_sound_sample_name(void) | |||
1980 | 1971 | ||
1981 | } | 1972 | } |
1982 | 1973 | ||
1983 | /* * delete space before * | 1974 | /** |
1984 | @page edcref | 1975 | @page edcref |
1985 | @property | 1976 | @property |
1986 | source | 1977 | source |
@@ -2016,7 +2007,7 @@ st_collections_group_sound_sample_source(void) | |||
2016 | check_arg_count(1); | 2007 | check_arg_count(1); |
2017 | } | 2008 | } |
2018 | 2009 | ||
2019 | /* * delete space before * | 2010 | /** |
2020 | @page edcref | 2011 | @page edcref |
2021 | @property | 2012 | @property |
2022 | tone | 2013 | tone |
@@ -2079,7 +2070,6 @@ st_collections_group_sound_tone(void) | |||
2079 | tone->value = value; | 2070 | tone->value = value; |
2080 | tone->id = edje_file->sound_dir->tones_count - 1; | 2071 | tone->id = edje_file->sound_dir->tones_count - 1; |
2081 | } | 2072 | } |
2082 | #endif | ||
2083 | 2073 | ||
2084 | /** | 2074 | /** |
2085 | @edcsection{group,Group sub blocks} | 2075 | @edcsection{group,Group sub blocks} |
@@ -2677,14 +2667,14 @@ st_collections_group_orientation(void) | |||
2677 | @block | 2667 | @block |
2678 | limits | 2668 | limits |
2679 | @context | 2669 | @context |
2680 | group { | 2670 | group { |
2681 | limits { | 2671 | limits { |
2682 | vertical: "limit_name" height_barrier; | 2672 | vertical: "limit_name" height_barrier; |
2683 | horizontal: "limit_name" width_barrier; | 2673 | horizontal: "limit_name" width_barrier; |
2684 | .. | 2674 | .. |
2685 | } | 2675 | } |
2686 | .. | 2676 | .. |
2687 | } | 2677 | } |
2688 | .. | 2678 | .. |
2689 | @description | 2679 | @description |
2690 | This block is used to trigger some signal when the Edje object is resized. | 2680 | This block is used to trigger some signal when the Edje object is resized. |
@@ -2696,10 +2686,10 @@ st_collections_group_orientation(void) | |||
2696 | @parameters | 2686 | @parameters |
2697 | [name] [height barrier] | 2687 | [name] [height barrier] |
2698 | @effect | 2688 | @effect |
2699 | It will send a signal: "limit,name,over" when the object is resized and pass | 2689 | It will send a signal: "limit,name,over" when the object is resized and pass |
2700 | the limit by growing over it. And it will send: "limit,name,below" when | 2690 | the limit by growing over it. And it will send: "limit,name,below" when |
2701 | it pass below that limit. | 2691 | it pass below that limit. |
2702 | This limit will be applied on the y absis. | 2692 | This limit will be applied on the y absis and is expressed in pixels. |
2703 | @endproperty | 2693 | @endproperty |
2704 | */ | 2694 | */ |
2705 | static void | 2695 | static void |
@@ -2734,10 +2724,10 @@ st_collections_group_limits_vertical(void) | |||
2734 | @parameters | 2724 | @parameters |
2735 | [name] [width barrier] | 2725 | [name] [width barrier] |
2736 | @effect | 2726 | @effect |
2737 | It will send a signal: "limit,name,over" when the object is resized and pass | 2727 | It will send a signal: "limit,name,over" when the object is resized and pass |
2738 | the limit by growing over it. And it will send: "limit,name,below" when | 2728 | the limit by growing over it. And it will send: "limit,name,below" when |
2739 | it pass below that limit. | 2729 | it pass below that limit. |
2740 | This limit will be applied on the x absis. | 2730 | This limit will be applied on the x absis and is expressed in pixels. |
2741 | @endproperty | 2731 | @endproperty |
2742 | */ | 2732 | */ |
2743 | static void | 2733 | static void |
@@ -3224,6 +3214,7 @@ st_collections_group_parts_part_source(void) | |||
3224 | 3214 | ||
3225 | //FIXME: validate this somehow (need to decide on the format also) | 3215 | //FIXME: validate this somehow (need to decide on the format also) |
3226 | current_part->source = parse_str(0); | 3216 | current_part->source = parse_str(0); |
3217 | data_queue_group_lookup(current_part->source, current_part); | ||
3227 | } | 3218 | } |
3228 | 3219 | ||
3229 | /** | 3220 | /** |
@@ -3245,6 +3236,7 @@ st_collections_group_parts_part_source2(void) | |||
3245 | 3236 | ||
3246 | //FIXME: validate this somehow (need to decide on the format also) | 3237 | //FIXME: validate this somehow (need to decide on the format also) |
3247 | current_part->source2 = parse_str(0); | 3238 | current_part->source2 = parse_str(0); |
3239 | data_queue_group_lookup(current_part->source2, current_part); | ||
3248 | } | 3240 | } |
3249 | 3241 | ||
3250 | /** | 3242 | /** |
@@ -3266,6 +3258,7 @@ st_collections_group_parts_part_source3(void) | |||
3266 | 3258 | ||
3267 | //FIXME: validate this somehow (need to decide on the format also) | 3259 | //FIXME: validate this somehow (need to decide on the format also) |
3268 | current_part->source3 = parse_str(0); | 3260 | current_part->source3 = parse_str(0); |
3261 | data_queue_group_lookup(current_part->source3, current_part); | ||
3269 | } | 3262 | } |
3270 | 3263 | ||
3271 | /** | 3264 | /** |
@@ -3287,6 +3280,7 @@ st_collections_group_parts_part_source4(void) | |||
3287 | 3280 | ||
3288 | //FIXME: validate this somehow (need to decide on the format also) | 3281 | //FIXME: validate this somehow (need to decide on the format also) |
3289 | current_part->source4 = parse_str(0); | 3282 | current_part->source4 = parse_str(0); |
3283 | data_queue_group_lookup(current_part->source4, current_part); | ||
3290 | } | 3284 | } |
3291 | 3285 | ||
3292 | /** | 3286 | /** |
@@ -3308,6 +3302,7 @@ st_collections_group_parts_part_source5(void) | |||
3308 | 3302 | ||
3309 | //FIXME: validate this somehow (need to decide on the format also) | 3303 | //FIXME: validate this somehow (need to decide on the format also) |
3310 | current_part->source5 = parse_str(0); | 3304 | current_part->source5 = parse_str(0); |
3305 | data_queue_group_lookup(current_part->source5, current_part); | ||
3311 | } | 3306 | } |
3312 | 3307 | ||
3313 | /** | 3308 | /** |
@@ -3329,6 +3324,7 @@ st_collections_group_parts_part_source6(void) | |||
3329 | 3324 | ||
3330 | //FIXME: validate this somehow (need to decide on the format also) | 3325 | //FIXME: validate this somehow (need to decide on the format also) |
3331 | current_part->source6 = parse_str(0); | 3326 | current_part->source6 = parse_str(0); |
3327 | data_queue_group_lookup(current_part->source6, current_part); | ||
3332 | } | 3328 | } |
3333 | 3329 | ||
3334 | /** | 3330 | /** |
@@ -3439,10 +3435,9 @@ st_collections_group_parts_part_entry_mode(void) | |||
3439 | [MODE] | 3435 | [MODE] |
3440 | @effect | 3436 | @effect |
3441 | Sets the selection mode for a textblock part to one of: | 3437 | Sets the selection mode for a textblock part to one of: |
3442 | @li DEFAULT | 3438 | @li DEFAULT selection mode is what you would expect on any desktop. Press |
3443 | @li EXPLICIT | 3439 | mouse, drag and release to end. |
3444 | DEFAULT selection mode is what you would expect on any desktop. Press | 3440 | @li EXPLICITmode requires the application |
3445 | mouse, drag and release to end. EXPLICIT mode requires the application | ||
3446 | controlling the edje object has to explicitly begin and end selection | 3441 | controlling the edje object has to explicitly begin and end selection |
3447 | modes, and the selection itself is dragable at both ends. | 3442 | modes, and the selection itself is dragable at both ends. |
3448 | @endproperty | 3443 | @endproperty |
@@ -3466,11 +3461,9 @@ st_collections_group_parts_part_select_mode(void) | |||
3466 | [MODE] | 3461 | [MODE] |
3467 | @effect | 3462 | @effect |
3468 | Sets the cursor mode for a textblock part to one of: | 3463 | Sets the cursor mode for a textblock part to one of: |
3469 | @li UNDER | 3464 | @li UNDER cursor mode means the cursor will draw below the character pointed |
3470 | @li BEFORE | ||
3471 | UNDER cursor mode means the cursor will draw below the character pointed | ||
3472 | at. That's the default. | 3465 | at. That's the default. |
3473 | BEFORE cursor mode means the cursor is drawn as a vertical line before | 3466 | @li BEFORE cursor mode means the cursor is drawn as a vertical line before |
3474 | the current character, just like many other GUI toolkits handle it. | 3467 | the current character, just like many other GUI toolkits handle it. |
3475 | @endproperty | 3468 | @endproperty |
3476 | */ | 3469 | */ |
@@ -3816,6 +3809,7 @@ static void st_collections_group_parts_part_box_items_item_source(void) | |||
3816 | check_arg_count(1); | 3809 | check_arg_count(1); |
3817 | 3810 | ||
3818 | current_item->source = parse_str(0); | 3811 | current_item->source = parse_str(0); |
3812 | data_queue_group_lookup(current_item->source, current_part); | ||
3819 | } | 3813 | } |
3820 | 3814 | ||
3821 | /** | 3815 | /** |
@@ -4140,6 +4134,9 @@ ob_collections_group_parts_part_description(void) | |||
4140 | ed->map.persp_on = 0; | 4134 | ed->map.persp_on = 0; |
4141 | ed->persp.zplane = 0; | 4135 | ed->persp.zplane = 0; |
4142 | ed->persp.focal = 1000; | 4136 | ed->persp.focal = 1000; |
4137 | ed->minmul.have = 1; | ||
4138 | ed->minmul.w = FROM_INT(1); | ||
4139 | ed->minmul.h = FROM_INT(1); | ||
4143 | } | 4140 | } |
4144 | 4141 | ||
4145 | /** | 4142 | /** |
@@ -4558,6 +4555,27 @@ st_collections_group_parts_part_description_min(void) | |||
4558 | /** | 4555 | /** |
4559 | @page edcref | 4556 | @page edcref |
4560 | @property | 4557 | @property |
4558 | minmul | ||
4559 | @parameters | ||
4560 | [width multipler] [height multiplier] | ||
4561 | @effect | ||
4562 | A multiplier FORCIBLY applied to whatever minimum size is only during | ||
4563 | minimum size calculation. | ||
4564 | @endproperty | ||
4565 | @since 1.2 | ||
4566 | */ | ||
4567 | static void | ||
4568 | st_collections_group_parts_part_description_minmul(void) | ||
4569 | { | ||
4570 | check_arg_count(2); | ||
4571 | |||
4572 | current_desc->minmul.w = FROM_DOUBLE(parse_float_range(0, 0, 999999)); | ||
4573 | current_desc->minmul.h = FROM_DOUBLE(parse_float_range(1, 0, 999999)); | ||
4574 | } | ||
4575 | |||
4576 | /** | ||
4577 | @page edcref | ||
4578 | @property | ||
4561 | max | 4579 | max |
4562 | @parameters | 4580 | @parameters |
4563 | [width] [height] | 4581 | [width] [height] |
@@ -4605,7 +4623,7 @@ st_collections_group_parts_part_description_step(void) | |||
4605 | Normally width and height can be resized to any values independently. | 4623 | Normally width and height can be resized to any values independently. |
4606 | The aspect property forces the width to height ratio to be kept between | 4624 | The aspect property forces the width to height ratio to be kept between |
4607 | the minimum and maximum set. For example, "1.0 1.0" will increase the | 4625 | the minimum and maximum set. For example, "1.0 1.0" will increase the |
4608 | width a pixel for every pixel added to heigh. The default value is | 4626 | width a pixel for every pixel added to height. The default value is |
4609 | "0.0 0.0" disabling aspect. | 4627 | "0.0 0.0" disabling aspect. |
4610 | @endproperty | 4628 | @endproperty |
4611 | */ | 4629 | */ |
@@ -4626,7 +4644,7 @@ st_collections_group_parts_part_description_aspect(void) | |||
4626 | [DIMENSION] | 4644 | [DIMENSION] |
4627 | @effect | 4645 | @effect |
4628 | Sets the scope of the "aspect" property to a given dimension. Available | 4646 | Sets the scope of the "aspect" property to a given dimension. Available |
4629 | options are BOTH, VERTICAL, HORIZONTAL and NONE | 4647 | options are BOTH, VERTICAL, HORIZONTAL, SOURCE and NONE |
4630 | @endproperty | 4648 | @endproperty |
4631 | */ | 4649 | */ |
4632 | static void | 4650 | static void |
@@ -4639,6 +4657,7 @@ st_collections_group_parts_part_description_aspect_preference(void) | |||
4639 | "VERTICAL", EDJE_ASPECT_PREFER_VERTICAL, | 4657 | "VERTICAL", EDJE_ASPECT_PREFER_VERTICAL, |
4640 | "HORIZONTAL", EDJE_ASPECT_PREFER_HORIZONTAL, | 4658 | "HORIZONTAL", EDJE_ASPECT_PREFER_HORIZONTAL, |
4641 | "BOTH", EDJE_ASPECT_PREFER_BOTH, | 4659 | "BOTH", EDJE_ASPECT_PREFER_BOTH, |
4660 | "SOURCE", EDJE_ASPECT_PREFER_SOURCE, | ||
4642 | NULL); | 4661 | NULL); |
4643 | } | 4662 | } |
4644 | 4663 | ||
@@ -7236,15 +7255,6 @@ st_collections_group_programs_program_in(void) | |||
7236 | current_program->in.range = parse_float_range(1, 0.0, 999999999.0); | 7255 | current_program->in.range = parse_float_range(1, 0.0, 999999999.0); |
7237 | } | 7256 | } |
7238 | 7257 | ||
7239 | #ifdef ENABLE_MULTISENSE | ||
7240 | /* add to docs below | ||
7241 | , PLAY_SAMPLE, PLAY_TONE | ||
7242 | |||
7243 | action: PLAY_SAMPLE "sample name";\n | ||
7244 | action: PLAY_TONE "tone name" duration in seconds ( Range 0.1 to 10.0 );\n | ||
7245 | */ | ||
7246 | #endif | ||
7247 | |||
7248 | /** | 7258 | /** |
7249 | @page edcref | 7259 | @page edcref |
7250 | @property | 7260 | @property |
@@ -7254,7 +7264,7 @@ st_collections_group_programs_program_in(void) | |||
7254 | @effect | 7264 | @effect |
7255 | Action to be performed by the program. Valid actions are: STATE_SET, | 7265 | Action to be performed by the program. Valid actions are: STATE_SET, |
7256 | ACTION_STOP, SIGNAL_EMIT, DRAG_VAL_SET, DRAG_VAL_STEP, DRAG_VAL_PAGE, | 7266 | ACTION_STOP, SIGNAL_EMIT, DRAG_VAL_SET, DRAG_VAL_STEP, DRAG_VAL_PAGE, |
7257 | FOCUS_SET, PARAM_COPY, PARAM_SET | 7267 | FOCUS_SET, PARAM_COPY, PARAM_SET, PLAY_SAMPLE, PLAY_TONE |
7258 | Only one action can be specified per program. Examples:\n | 7268 | Only one action can be specified per program. Examples:\n |
7259 | action: STATE_SET "statename" 0.5;\n | 7269 | action: STATE_SET "statename" 0.5;\n |
7260 | action: ACTION_STOP;\n | 7270 | action: ACTION_STOP;\n |
@@ -7266,6 +7276,8 @@ st_collections_group_programs_program_in(void) | |||
7266 | action: FOCUS_OBJECT;\n | 7276 | action: FOCUS_OBJECT;\n |
7267 | action: PARAM_COPY "src_part" "src_param" "dst_part" "dst_param";\n | 7277 | action: PARAM_COPY "src_part" "src_param" "dst_part" "dst_param";\n |
7268 | action: PARAM_SET "part" "param" "value";\n | 7278 | action: PARAM_SET "part" "param" "value";\n |
7279 | action: PLAY_SAMPLE "sample name";\n | ||
7280 | action: PLAY_TONE "tone name" duration in seconds ( Range 0.1 to 10.0 );\n | ||
7269 | @endproperty | 7281 | @endproperty |
7270 | */ | 7282 | */ |
7271 | static void | 7283 | static void |
@@ -7273,6 +7285,7 @@ st_collections_group_programs_program_action(void) | |||
7273 | { | 7285 | { |
7274 | Edje_Part_Collection *pc; | 7286 | Edje_Part_Collection *pc; |
7275 | Edje_Program *ep; | 7287 | Edje_Program *ep; |
7288 | int i; | ||
7276 | 7289 | ||
7277 | pc = eina_list_data_get(eina_list_last(edje_collections)); | 7290 | pc = eina_list_data_get(eina_list_last(edje_collections)); |
7278 | ep = current_program; | 7291 | ep = current_program; |
@@ -7288,10 +7301,8 @@ st_collections_group_programs_program_action(void) | |||
7288 | "FOCUS_OBJECT", EDJE_ACTION_TYPE_FOCUS_OBJECT, | 7301 | "FOCUS_OBJECT", EDJE_ACTION_TYPE_FOCUS_OBJECT, |
7289 | "PARAM_COPY", EDJE_ACTION_TYPE_PARAM_COPY, | 7302 | "PARAM_COPY", EDJE_ACTION_TYPE_PARAM_COPY, |
7290 | "PARAM_SET", EDJE_ACTION_TYPE_PARAM_SET, | 7303 | "PARAM_SET", EDJE_ACTION_TYPE_PARAM_SET, |
7291 | #ifdef ENABLE_MULTISENSE | ||
7292 | "PLAY_SAMPLE", EDJE_ACTION_TYPE_SOUND_SAMPLE, | 7304 | "PLAY_SAMPLE", EDJE_ACTION_TYPE_SOUND_SAMPLE, |
7293 | "PLAY_TONE", EDJE_ACTION_TYPE_SOUND_TONE, | 7305 | "PLAY_TONE", EDJE_ACTION_TYPE_SOUND_TONE, |
7294 | #endif | ||
7295 | NULL); | 7306 | NULL); |
7296 | if (ep->action == EDJE_ACTION_TYPE_STATE_SET) | 7307 | if (ep->action == EDJE_ACTION_TYPE_STATE_SET) |
7297 | { | 7308 | { |
@@ -7303,11 +7314,8 @@ st_collections_group_programs_program_action(void) | |||
7303 | ep->state = parse_str(1); | 7314 | ep->state = parse_str(1); |
7304 | ep->state2 = parse_str(2); | 7315 | ep->state2 = parse_str(2); |
7305 | } | 7316 | } |
7306 | #ifdef ENABLE_MULTISENSE | ||
7307 | else if (ep->action == EDJE_ACTION_TYPE_SOUND_SAMPLE) | 7317 | else if (ep->action == EDJE_ACTION_TYPE_SOUND_SAMPLE) |
7308 | { | 7318 | { |
7309 | int i; | ||
7310 | |||
7311 | ep->sample_name = parse_str(1); | 7319 | ep->sample_name = parse_str(1); |
7312 | for (i = 0; i < (int)edje_file->sound_dir->samples_count; i++) | 7320 | for (i = 0; i < (int)edje_file->sound_dir->samples_count; i++) |
7313 | { | 7321 | { |
@@ -7324,8 +7332,6 @@ st_collections_group_programs_program_action(void) | |||
7324 | } | 7332 | } |
7325 | else if (ep->action == EDJE_ACTION_TYPE_SOUND_TONE) | 7333 | else if (ep->action == EDJE_ACTION_TYPE_SOUND_TONE) |
7326 | { | 7334 | { |
7327 | int i; | ||
7328 | |||
7329 | ep->tone_name = parse_str(1); | 7335 | ep->tone_name = parse_str(1); |
7330 | for (i = 0; i < (int)edje_file->sound_dir->tones_count; i++) | 7336 | for (i = 0; i < (int)edje_file->sound_dir->tones_count; i++) |
7331 | { | 7337 | { |
@@ -7340,7 +7346,6 @@ st_collections_group_programs_program_action(void) | |||
7340 | } | 7346 | } |
7341 | ep->duration = parse_float_range(2, 0.1, 10.0); | 7347 | ep->duration = parse_float_range(2, 0.1, 10.0); |
7342 | } | 7348 | } |
7343 | #endif | ||
7344 | else if (ep->action == EDJE_ACTION_TYPE_DRAG_VAL_SET) | 7349 | else if (ep->action == EDJE_ACTION_TYPE_DRAG_VAL_SET) |
7345 | { | 7350 | { |
7346 | ep->value = parse_float(1); | 7351 | ep->value = parse_float(1); |
@@ -7402,14 +7407,12 @@ st_collections_group_programs_program_action(void) | |||
7402 | case EDJE_ACTION_TYPE_PARAM_SET: | 7407 | case EDJE_ACTION_TYPE_PARAM_SET: |
7403 | check_arg_count(4); | 7408 | check_arg_count(4); |
7404 | break; | 7409 | break; |
7405 | #ifdef ENABLE_MULTISENSE | ||
7406 | case EDJE_ACTION_TYPE_SOUND_SAMPLE: | 7410 | case EDJE_ACTION_TYPE_SOUND_SAMPLE: |
7407 | check_arg_count(3); | 7411 | check_arg_count(3); |
7408 | break; | 7412 | break; |
7409 | case EDJE_ACTION_TYPE_SOUND_TONE: | 7413 | case EDJE_ACTION_TYPE_SOUND_TONE: |
7410 | check_arg_count(3); | 7414 | check_arg_count(3); |
7411 | break; | 7415 | break; |
7412 | #endif | ||
7413 | default: | 7416 | default: |
7414 | check_arg_count(3); | 7417 | check_arg_count(3); |
7415 | } | 7418 | } |