summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-07-07 16:30:57 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-07-07 16:30:57 +0900
commit5981069012d938b2ace2f5a5da3f201d73e08d1e (patch)
treeceacbc219c6900e3fbe0d5205f006de2c91082e7 /data
parenta79dc9a8b5ce9fe155063588838604c67acb30e0 (diff)
Revert "remove sounds when pressing keys"
This reverts commit 40c83a01133bcbb36b67ac3e589e5e09758d49a8. elementary_config has features to mute sounds if you want - point them to that. there is a whole elm config and sound category system devoted to this
Diffstat (limited to 'data')
-rw-r--r--data/themes/default.edc66
-rw-r--r--data/themes/mild.edc46
-rw-r--r--data/themes/sounds/Makefile.am7
-rw-r--r--data/themes/sounds/kbd-tap.wavbin0 -> 15668 bytes
-rw-r--r--data/themes/sounds/kbd-tap2.wavbin0 -> 20848 bytes
-rw-r--r--data/themes/sounds/kbd-tap3.wavbin0 -> 22024 bytes
-rw-r--r--data/themes/sounds/kbd-tap4.wavbin0 -> 26784 bytes
-rw-r--r--data/themes/sounds/kbd-tap5.wavbin0 -> 22528 bytes
8 files changed, 118 insertions, 1 deletions
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 252cd12..7d653aa 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -2339,6 +2339,23 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
2339 image: "cr_pulse.png" COMP; 2339 image: "cr_pulse.png" COMP;
2340 image: "cr_glow.png" COMP; 2340 image: "cr_glow.png" COMP;
2341 } 2341 }
2342 sounds {
2343 sample { name: "key-tap1" LOSSY 64;
2344 source: "kbd-tap.wav";
2345 }
2346 sample { name: "key-tap2" LOSSY 64;
2347 source: "kbd-tap2.wav";
2348 }
2349 sample { name: "key-tap3" LOSSY 64;
2350 source: "kbd-tap3.wav";
2351 }
2352 sample { name: "key-tap4" LOSSY 64;
2353 source: "kbd-tap4.wav";
2354 }
2355 sample { name: "key-tap5" LOSSY 64;
2356 source: "kbd-tap5.wav";
2357 }
2358 }
2342 parts { 2359 parts {
2343 part { name: "key"; 2360 part { name: "key";
2344 mouse_events: 0; 2361 mouse_events: 0;
@@ -2484,6 +2501,55 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
2484 } 2501 }
2485 program { 2502 program {
2486 signal: "key,down"; source: "terminology"; 2503 signal: "key,down"; source: "terminology";
2504 script {
2505#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 8)
2506 new buf[32];
2507 snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
2508 run_program(get_program_id(buf));
2509#else
2510 run_program(PROGRAM:"key-down4"); // chosen by a fair dice roll
2511 // guaranteed to be random.
2512 // http://xkcd.com/221/
2513#endif
2514 }
2515 }
2516 program { name: "key-down1";
2517#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
2518 action: PLAY_SAMPLE "key-tap1" 1.0 INPUT;
2519#else
2520 action: PLAY_SAMPLE "key-tap1" 1.0;
2521#endif
2522 }
2523 program { name: "key-down2";
2524#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
2525 action: PLAY_SAMPLE "key-tap2" 1.0 INPUT;
2526#else
2527 action: PLAY_SAMPLE "key-tap2" 1.0;
2528#endif
2529 }
2530 program { name: "key-down3";
2531#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
2532 action: PLAY_SAMPLE "key-tap3" 1.0 INPUT;
2533#else
2534 action: PLAY_SAMPLE "key-tap3" 1.0;
2535#endif
2536 }
2537 program { name: "key-down4";
2538#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
2539 action: PLAY_SAMPLE "key-tap4" 1.0 INPUT;
2540#else
2541 action: PLAY_SAMPLE "key-tap4" 1.0;
2542#endif
2543 }
2544 program { name: "key-down5";
2545#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
2546 action: PLAY_SAMPLE "key-tap5" 1.0 INPUT;
2547#else
2548 action: PLAY_SAMPLE "key-tap5" 1.0;
2549#endif
2550 }
2551 program {
2552 signal: "key,down"; source: "terminology";
2487 action: STATE_SET "default" 0.0; 2553 action: STATE_SET "default" 0.0;
2488 target: "key"; 2554 target: "key";
2489 after: "key2"; 2555 after: "key2";
diff --git a/data/themes/mild.edc b/data/themes/mild.edc
index df1ce05..2db3618 100644
--- a/data/themes/mild.edc
+++ b/data/themes/mild.edc
@@ -1105,6 +1105,23 @@ collections {
1105 image: "cr_key.png" COMP; 1105 image: "cr_key.png" COMP;
1106 image: "cr_out.png" COMP; 1106 image: "cr_out.png" COMP;
1107 } 1107 }
1108 sounds {
1109 sample { name: "key-tap1" LOSSY 64;
1110 source: "kbd-tap.wav";
1111 }
1112 sample { name: "key-tap2" LOSSY 64;
1113 source: "kbd-tap2.wav";
1114 }
1115 sample { name: "key-tap3" LOSSY 64;
1116 source: "kbd-tap3.wav";
1117 }
1118 sample { name: "key-tap4" LOSSY 64;
1119 source: "kbd-tap4.wav";
1120 }
1121 sample { name: "key-tap5" LOSSY 64;
1122 source: "kbd-tap5.wav";
1123 }
1124 }
1108 parts { 1125 parts {
1109 part { name: "pulsclip"; type: RECT; 1126 part { name: "pulsclip"; type: RECT;
1110 description { state: "default" 0.0; 1127 description { state: "default" 0.0;
@@ -1201,6 +1218,35 @@ collections {
1201 target: "outline"; 1218 target: "outline";
1202 target: "pulsclip"; 1219 target: "pulsclip";
1203 } 1220 }
1221 program {
1222 signal: "key,down"; source: "terminology";
1223 script {
1224#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 8)
1225 new buf[32];
1226 snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
1227 run_program(get_program_id(buf));
1228#else
1229 run_program(PROGRAM:"key-down4"); // chosen by a fair dice roll
1230 // guaranteed to be random.
1231 // http://xkcd.com/221/
1232#endif
1233 }
1234 }
1235 program { name: "key-down1";
1236 action: PLAY_SAMPLE "key-tap1" 1.0;
1237 }
1238 program { name: "key-down2";
1239 action: PLAY_SAMPLE "key-tap2" 1.0;
1240 }
1241 program { name: "key-down3";
1242 action: PLAY_SAMPLE "key-tap3" 1.0;
1243 }
1244 program { name: "key-down4";
1245 action: PLAY_SAMPLE "key-tap4" 1.0;
1246 }
1247 program { name: "key-down5";
1248 action: PLAY_SAMPLE "key-tap5" 1.0;
1249 }
1204 program { name: "key"; 1250 program { name: "key";
1205 signal: "key,down"; 1251 signal: "key,down";
1206 source: "terminology"; 1252 source: "terminology";
diff --git a/data/themes/sounds/Makefile.am b/data/themes/sounds/Makefile.am
index ef6c469..68a996f 100644
--- a/data/themes/sounds/Makefile.am
+++ b/data/themes/sounds/Makefile.am
@@ -1,3 +1,8 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2EXTRA_DIST = \ 2EXTRA_DIST = \
3bell.wav 3bell.wav \
4kbd-tap2.wav \
5kbd-tap3.wav \
6kbd-tap4.wav \
7kbd-tap5.wav \
8kbd-tap.wav
diff --git a/data/themes/sounds/kbd-tap.wav b/data/themes/sounds/kbd-tap.wav
new file mode 100644
index 0000000..50bbf4c
--- /dev/null
+++ b/data/themes/sounds/kbd-tap.wav
Binary files differ
diff --git a/data/themes/sounds/kbd-tap2.wav b/data/themes/sounds/kbd-tap2.wav
new file mode 100644
index 0000000..8ca8d0a
--- /dev/null
+++ b/data/themes/sounds/kbd-tap2.wav
Binary files differ
diff --git a/data/themes/sounds/kbd-tap3.wav b/data/themes/sounds/kbd-tap3.wav
new file mode 100644
index 0000000..849fa1c
--- /dev/null
+++ b/data/themes/sounds/kbd-tap3.wav
Binary files differ
diff --git a/data/themes/sounds/kbd-tap4.wav b/data/themes/sounds/kbd-tap4.wav
new file mode 100644
index 0000000..eecd4e3
--- /dev/null
+++ b/data/themes/sounds/kbd-tap4.wav
Binary files differ
diff --git a/data/themes/sounds/kbd-tap5.wav b/data/themes/sounds/kbd-tap5.wav
new file mode 100644
index 0000000..a2dc79b
--- /dev/null
+++ b/data/themes/sounds/kbd-tap5.wav
Binary files differ