diff --git a/legacy/edje/configure.ac b/legacy/edje/configure.ac index 287e1ca654..277d07b33a 100644 --- a/legacy/edje/configure.ac +++ b/legacy/edje/configure.ac @@ -291,14 +291,14 @@ PKG_CHECK_MODULES([ECORE_IMF], [have_ecore_imf="no"]) # Enable Multisense use -want_multisense="no" -dnl AC_ARG_ENABLE([multisense], -dnl [AC_HELP_STRING( -dnl [--enable-multisense], -dnl [multisense provides sound. tone and haptic effects support, [[default=disabled]]] -dnl )], -dnl [want_multisense=$enableval] -dnl ) +want_multisense="yes" +AC_ARG_ENABLE([multisense], + [AC_HELP_STRING( + [--enable-multisense], + [multisense provides sound. tone and haptic effects support, [[default=disabled]]] + )], + [want_multisense=$enableval] +) AM_CONDITIONAL([ENABLE_MULTISENSE], [test "x${want_multisense}" = "xyes"]) ##sndfile library diff --git a/legacy/edje/src/bin/edje_cc_handlers.c b/legacy/edje/src/bin/edje_cc_handlers.c index 8bfc262325..633b989fa8 100644 --- a/legacy/edje/src/bin/edje_cc_handlers.c +++ b/legacy/edje/src/bin/edje_cc_handlers.c @@ -261,12 +261,9 @@ static void st_collections_group_programs_program_after(void); static void st_collections_group_programs_program_api(void); static void ob_collections_group_programs_program_script(void); - -#ifdef ENABLE_MULTISENSE static void st_collections_group_sound_sample_name(void); static void st_collections_group_sound_sample_source(void); static void st_collections_group_sound_tone(void); -#endif /*****/ @@ -305,14 +302,13 @@ New_Statement_Handler statement_handlers[] = {"collections.color_classes.color_class.color", st_color_class_color}, /* dup */ {"collections.color_classes.color_class.color2", st_color_class_color2}, /* dup */ {"collections.color_classes.color_class.color3", st_color_class_color3}, /* dup */ -#ifdef ENABLE_MULTISENSE + {"collections.sounds.sample.name", st_collections_group_sound_sample_name}, {"collections.sounds.sample.source", st_collections_group_sound_sample_source}, {"collections.group.sounds.sample.name", st_collections_group_sound_sample_name}, /* dup */ {"collections.group.sounds.sample.source", st_collections_group_sound_sample_source}, /* dup */ {"collections.sounds.tone", st_collections_group_sound_tone}, {"collections.group.sounds.tone", st_collections_group_sound_tone}, /* dup */ -#endif {"collections.group.name", st_collections_group_name}, {"collections.group.inherit", st_collections_group_inherit}, {"collections.group.script_only", st_collections_group_script_only}, @@ -677,12 +673,10 @@ New_Object_Handler object_handlers[] = {"collections.styles.style", ob_styles_style}, /* dup */ {"collections.color_classes", NULL}, /* dup */ {"collections.color_classes.color_class", ob_color_class}, /* dup */ -#ifdef ENABLE_MULTISENSE {"collections.sounds", NULL}, {"collections.group.sounds", NULL}, /* dup */ {"collections.sounds.sample", NULL}, {"collections.group.sounds.sample", NULL}, /* dup */ -#endif {"collections.group", ob_collections_group}, {"collections.group.data", NULL}, {"collections.group.script", ob_collections_group_script}, @@ -1836,12 +1830,6 @@ st_styles_style_tag(void) stl->tags = eina_list_append(stl->tags, tag); } -#ifdef ENABLE_MULTISENSE -/* add to below doc -sounds { } - */ -#endif - /** @page edcref @block @@ -1851,6 +1839,7 @@ sounds { } .. group { } group { } + sounds { } .. } @description @@ -1866,8 +1855,7 @@ ob_collections(void) edje_file->collection = eina_hash_string_small_new(NULL); } -#ifdef ENABLE_MULTISENSE -/* * delete space before * +/** @page edcref @block sounds @@ -1980,7 +1968,7 @@ st_collections_group_sound_sample_name(void) } -/* * delete space before * +/** @page edcref @property source @@ -2016,7 +2004,7 @@ st_collections_group_sound_sample_source(void) check_arg_count(1); } -/* * delete space before * +/** @page edcref @property tone @@ -2079,7 +2067,6 @@ st_collections_group_sound_tone(void) tone->value = value; tone->id = edje_file->sound_dir->tones_count - 1; } -#endif /** @edcsection{group,Group sub blocks} @@ -7236,15 +7223,6 @@ st_collections_group_programs_program_in(void) current_program->in.range = parse_float_range(1, 0.0, 999999999.0); } -#ifdef ENABLE_MULTISENSE -/* add to docs below -, PLAY_SAMPLE, PLAY_TONE - - action: PLAY_SAMPLE "sample name";\n - action: PLAY_TONE "tone name" duration in seconds ( Range 0.1 to 10.0 );\n -*/ -#endif - /** @page edcref @property @@ -7254,7 +7232,7 @@ st_collections_group_programs_program_in(void) @effect Action to be performed by the program. Valid actions are: STATE_SET, ACTION_STOP, SIGNAL_EMIT, DRAG_VAL_SET, DRAG_VAL_STEP, DRAG_VAL_PAGE, - FOCUS_SET, PARAM_COPY, PARAM_SET + FOCUS_SET, PARAM_COPY, PARAM_SET, PLAY_SAMPLE, PLAY_TONE Only one action can be specified per program. Examples:\n action: STATE_SET "statename" 0.5;\n action: ACTION_STOP;\n @@ -7266,6 +7244,8 @@ st_collections_group_programs_program_in(void) action: FOCUS_OBJECT;\n action: PARAM_COPY "src_part" "src_param" "dst_part" "dst_param";\n action: PARAM_SET "part" "param" "value";\n + action: PLAY_SAMPLE "sample name";\n + action: PLAY_TONE "tone name" duration in seconds ( Range 0.1 to 10.0 );\n @endproperty */ static void @@ -7273,6 +7253,7 @@ st_collections_group_programs_program_action(void) { Edje_Part_Collection *pc; Edje_Program *ep; + int i; pc = eina_list_data_get(eina_list_last(edje_collections)); ep = current_program; @@ -7288,10 +7269,8 @@ st_collections_group_programs_program_action(void) "FOCUS_OBJECT", EDJE_ACTION_TYPE_FOCUS_OBJECT, "PARAM_COPY", EDJE_ACTION_TYPE_PARAM_COPY, "PARAM_SET", EDJE_ACTION_TYPE_PARAM_SET, -#ifdef ENABLE_MULTISENSE "PLAY_SAMPLE", EDJE_ACTION_TYPE_SOUND_SAMPLE, "PLAY_TONE", EDJE_ACTION_TYPE_SOUND_TONE, -#endif NULL); if (ep->action == EDJE_ACTION_TYPE_STATE_SET) { @@ -7303,11 +7282,8 @@ st_collections_group_programs_program_action(void) ep->state = parse_str(1); ep->state2 = parse_str(2); } -#ifdef ENABLE_MULTISENSE else if (ep->action == EDJE_ACTION_TYPE_SOUND_SAMPLE) { - int i; - ep->sample_name = parse_str(1); for (i = 0; i < (int)edje_file->sound_dir->samples_count; i++) { @@ -7324,8 +7300,6 @@ st_collections_group_programs_program_action(void) } else if (ep->action == EDJE_ACTION_TYPE_SOUND_TONE) { - int i; - ep->tone_name = parse_str(1); for (i = 0; i < (int)edje_file->sound_dir->tones_count; i++) { @@ -7340,7 +7314,6 @@ st_collections_group_programs_program_action(void) } ep->duration = parse_float_range(2, 0.1, 10.0); } -#endif else if (ep->action == EDJE_ACTION_TYPE_DRAG_VAL_SET) { ep->value = parse_float(1); @@ -7402,14 +7375,12 @@ st_collections_group_programs_program_action(void) case EDJE_ACTION_TYPE_PARAM_SET: check_arg_count(4); break; -#ifdef ENABLE_MULTISENSE case EDJE_ACTION_TYPE_SOUND_SAMPLE: check_arg_count(3); break; case EDJE_ACTION_TYPE_SOUND_TONE: check_arg_count(3); break; -#endif default: check_arg_count(3); } diff --git a/legacy/edje/src/examples/multisense.edc b/legacy/edje/src/examples/multisense.edc index 00f352627d..b0423b9bf1 100644 --- a/legacy/edje/src/examples/multisense.edc +++ b/legacy/edje/src/examples/multisense.edc @@ -36,7 +36,6 @@ collections { // name: "sound_name6" LOSSY 45.0; source: "sample-flac44k-mono.wav"; // source: "sample-flac.wav"; -// source: "sample-flac.wav"; // source: "sample.ogg"; } tone: "tone-name" 2600;