summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-02-09 19:08:12 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-02-09 19:08:12 +0900
commitdb1990020a9039d867bf620d9f9463dda443f31e (patch)
tree5eee2efd5fbca5563a5359adce32398c977b4508 /src/bin
parent7c7f2eb30032b520d66fe43fa7000ae18264de49 (diff)
edje - feature - add channel types for sounds and ability to mute them
this adds a new feature to be able to assign a sample to a given "type" of audio channel, and then to be able to mute these from code.
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/edje/edje_cc_handlers.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 0ea056d3ba..dda4116d2a 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -9126,7 +9126,7 @@ st_collections_group_programs_program_in(void)
9126 action: FOCUS_OBJECT;\n 9126 action: FOCUS_OBJECT;\n
9127 action: PARAM_COPY "src_part" "src_param" "dst_part" "dst_param";\n 9127 action: PARAM_COPY "src_part" "src_param" "dst_part" "dst_param";\n
9128 action: PARAM_SET "part" "param" "value";\n 9128 action: PARAM_SET "part" "param" "value";\n
9129 action: PLAY_SAMPLE "sample name" speed (speed of sample - 1.0 is original speed - faster is higher pitch);\n 9129 action: PLAY_SAMPLE "sample name" speed (speed of sample - 1.0 is original speed - faster is higher pitch) [channel optional EFFECT/FX | BACKGROUND/BG | MUSIC/MUS | FOREGROUND/FG | INTERFACE/UI | INPUT | ALERT;\n
9130 action: PLAY_TONE "tone name" duration in seconds ( Range 0.1 to 10.0 );\n 9130 action: PLAY_TONE "tone name" duration in seconds ( Range 0.1 to 10.0 );\n
9131 action: PHYSICS_IMPULSE 10 -23.4 0;\n 9131 action: PHYSICS_IMPULSE 10 -23.4 0;\n
9132 action: PHYSICS_TORQUE_IMPULSE 0 2.1 0.95;\n 9132 action: PHYSICS_TORQUE_IMPULSE 0 2.1 0.95;\n
@@ -9199,6 +9199,16 @@ st_collections_group_programs_program_action(void)
9199 } 9199 }
9200 } 9200 }
9201 ep->speed = parse_float_range(2, 0.0, 100.0); 9201 ep->speed = parse_float_range(2, 0.0, 100.0);
9202 if (get_arg_count() >= 4)
9203 ep->channel = parse_enum(3,
9204 "EFFECT", 0, "FX", 0,
9205 "BACKGROUND", 1, "BG", 1,
9206 "MUSIC", 2, "MUS", 2,
9207 "FOREGROUND", 3, "FG", 3,
9208 "INTERFACE", 4, "UI", 4,
9209 "INPUT", 5,
9210 "ALERT", 6,
9211 NULL);
9202 } 9212 }
9203 else if (ep->action == EDJE_ACTION_TYPE_SOUND_TONE) 9213 else if (ep->action == EDJE_ACTION_TYPE_SOUND_TONE)
9204 { 9214 {
@@ -9303,6 +9313,8 @@ st_collections_group_programs_program_action(void)
9303 case EDJE_ACTION_TYPE_PHYSICS_ROT_SET: 9313 case EDJE_ACTION_TYPE_PHYSICS_ROT_SET:
9304 check_arg_count(5); 9314 check_arg_count(5);
9305 break; 9315 break;
9316 case EDJE_ACTION_TYPE_SOUND_SAMPLE:
9317 break;
9306 default: 9318 default:
9307 check_arg_count(3); 9319 check_arg_count(3);
9308 } 9320 }