summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Willmann <d.willmann@samsung.com>2013-03-15 15:33:34 +0000
committerDaniel Willmann <d.willmann@samsung.com>2013-03-15 15:40:34 +0000
commit898be332d08257cbbb22ef0d15257670058dcfbd (patch)
tree1f609af18a191ce13c48ae911e566237cc37ac92
parent5a61d5f73376d98c1237dadf2ae54eebdb180cd5 (diff)
Comp effects with sound (need to enable edje_multisense)devs/asdfuser/comp-sounds
I know comp.edc is probably not the right place for this, but so far it's just for testing. Sounds are CC0 from freesound.org Signed-off-by: Daniel Willmann <d.willmann@samsung.com>
-rw-r--r--data/themes/Makefile.am5
-rw-r--r--data/themes/edc/comp.edc18
-rw-r--r--data/themes/snd/boing.wavbin0 -> 65480 bytes
-rw-r--r--data/themes/snd/siren.wavbin0 -> 306804 bytes
4 files changed, 22 insertions, 1 deletions
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 0be183e8d..6611c9246 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -7,6 +7,7 @@ EDJE_FLAGS_VERBOSE_0 =
7EDJE_FLAGS_VERBOSE_1 = -v 7EDJE_FLAGS_VERBOSE_1 = -v
8EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) \ 8EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) \
9-id $(top_srcdir)/data/themes/img \ 9-id $(top_srcdir)/data/themes/img \
10-sd $(top_srcdir)/data/themes/snd \
10-fd $(top_srcdir)/data/themes/fnt \ 11-fd $(top_srcdir)/data/themes/fnt \
11@EDJE_DEF@ 12@EDJE_DEF@
12 13
@@ -723,7 +724,9 @@ img/O/wp-tb1.png \
723img/O/wp-tb2.png \ 724img/O/wp-tb2.png \
724img/O/wp-tb3.png \ 725img/O/wp-tb3.png \
725img/O/wp-tbs.png \ 726img/O/wp-tbs.png \
726img/outline_glow.png 727img/outline_glow.png \
728snd/boing.wav \
729snd/siren.wav
727 730
728default.edj: Makefile $(EXTRA_DIST) 731default.edj: Makefile $(EXTRA_DIST)
729 $(EDJE_CC) $(EDJE_FLAGS) \ 732 $(EDJE_CC) $(EDJE_FLAGS) \
diff --git a/data/themes/edc/comp.edc b/data/themes/edc/comp.edc
index 7f0831d7b..7d800a7e3 100644
--- a/data/themes/edc/comp.edc
+++ b/data/themes/edc/comp.edc
@@ -244,6 +244,16 @@ group { name: "e/comp/screen/overlay/noeffects";
244group { name: "e/comp/default"; 244group { name: "e/comp/default";
245 images.image: "win_shadow.png" COMP; 245 images.image: "win_shadow.png" COMP;
246 images.image: "win_glow.png" COMP; 246 images.image: "win_glow.png" COMP;
247 sounds {
248 sample {
249 name: "boing" RAW;
250 source: "boing.wav";
251 }
252 sample {
253 name: "siren" RAW;
254 source: "siren.wav";
255 }
256 }
247 parts { 257 parts {
248 part { name: "clipper"; type: RECT; 258 part { name: "clipper"; type: RECT;
249 description { state: "default" 0.0; 259 description { state: "default" 0.0;
@@ -383,6 +393,10 @@ group { name: "e/comp/default";
383 transition: SINUSOIDAL 0.1; 393 transition: SINUSOIDAL 0.1;
384 target: "glow"; 394 target: "glow";
385 target: "focus-clipper"; 395 target: "focus-clipper";
396 after: "focus_sound";
397 }
398 program { name: "focus_sound";
399 action: PLAY_SAMPLE "boing" 1.0;
386 after: "focus2"; 400 after: "focus2";
387 } 401 }
388 program { name: "focus2"; 402 program { name: "focus2";
@@ -409,6 +423,10 @@ group { name: "e/comp/default";
409 action: STATE_SET "focused" 0.0; 423 action: STATE_SET "focused" 0.0;
410 transition: SINUSOIDAL 0.3; 424 transition: SINUSOIDAL 0.3;
411 target: "glow"; 425 target: "glow";
426 after: "urgent_sound";
427 }
428 program { name: "urgent_sound";
429 action: PLAY_SAMPLE "siren" 1.0;
412 after: "urgent2"; 430 after: "urgent2";
413 } 431 }
414 program { name: "urgent2"; 432 program { name: "urgent2";
diff --git a/data/themes/snd/boing.wav b/data/themes/snd/boing.wav
new file mode 100644
index 000000000..f74be7519
--- /dev/null
+++ b/data/themes/snd/boing.wav
Binary files differ
diff --git a/data/themes/snd/siren.wav b/data/themes/snd/siren.wav
new file mode 100644
index 000000000..1722ac353
--- /dev/null
+++ b/data/themes/snd/siren.wav
Binary files differ