diff options
author | Daniel Willmann <d.willmann@samsung.com> | 2013-03-15 15:33:34 +0000 |
---|---|---|
committer | Daniel Willmann <d.willmann@samsung.com> | 2013-03-15 15:40:34 +0000 |
commit | 898be332d08257cbbb22ef0d15257670058dcfbd (patch) | |
tree | 1f609af18a191ce13c48ae911e566237cc37ac92 | |
parent | 5a61d5f73376d98c1237dadf2ae54eebdb180cd5 (diff) | |
download | enlightenment-devs/asdfuser/comp-sounds.tar.gz |
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.am | 5 | ||||
-rw-r--r-- | data/themes/edc/comp.edc | 18 | ||||
-rw-r--r-- | data/themes/snd/boing.wav | bin | 0 -> 65480 bytes | |||
-rw-r--r-- | data/themes/snd/siren.wav | bin | 0 -> 306804 bytes |
4 files changed, 22 insertions, 1 deletions
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am index 0be183e8de..6611c92464 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.am @@ -7,6 +7,7 @@ EDJE_FLAGS_VERBOSE_0 = EDJE_FLAGS_VERBOSE_1 = -v EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) \ -id $(top_srcdir)/data/themes/img \ +-sd $(top_srcdir)/data/themes/snd \ -fd $(top_srcdir)/data/themes/fnt \ @EDJE_DEF@ @@ -723,7 +724,9 @@ img/O/wp-tb1.png \ img/O/wp-tb2.png \ img/O/wp-tb3.png \ img/O/wp-tbs.png \ -img/outline_glow.png +img/outline_glow.png \ +snd/boing.wav \ +snd/siren.wav default.edj: Makefile $(EXTRA_DIST) $(EDJE_CC) $(EDJE_FLAGS) \ diff --git a/data/themes/edc/comp.edc b/data/themes/edc/comp.edc index 7f0831d7b2..7d800a7e35 100644 --- a/data/themes/edc/comp.edc +++ b/data/themes/edc/comp.edc @@ -244,6 +244,16 @@ group { name: "e/comp/screen/overlay/noeffects"; group { name: "e/comp/default"; images.image: "win_shadow.png" COMP; images.image: "win_glow.png" COMP; + sounds { + sample { + name: "boing" RAW; + source: "boing.wav"; + } + sample { + name: "siren" RAW; + source: "siren.wav"; + } + } parts { part { name: "clipper"; type: RECT; description { state: "default" 0.0; @@ -383,6 +393,10 @@ group { name: "e/comp/default"; transition: SINUSOIDAL 0.1; target: "glow"; target: "focus-clipper"; + after: "focus_sound"; + } + program { name: "focus_sound"; + action: PLAY_SAMPLE "boing" 1.0; after: "focus2"; } program { name: "focus2"; @@ -409,6 +423,10 @@ group { name: "e/comp/default"; action: STATE_SET "focused" 0.0; transition: SINUSOIDAL 0.3; target: "glow"; + after: "urgent_sound"; + } + program { name: "urgent_sound"; + action: PLAY_SAMPLE "siren" 1.0; after: "urgent2"; } program { name: "urgent2"; diff --git a/data/themes/snd/boing.wav b/data/themes/snd/boing.wav Binary files differnew file mode 100644 index 0000000000..f74be75190 --- /dev/null +++ b/data/themes/snd/boing.wav diff --git a/data/themes/snd/siren.wav b/data/themes/snd/siren.wav Binary files differnew file mode 100644 index 0000000000..1722ac3533 --- /dev/null +++ b/data/themes/snd/siren.wav |