Revert "remove sounds when pressing keys"

This reverts commit 40c83a0113.

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
This commit is contained in:
Carsten Haitzler 2014-07-07 16:30:57 +09:00
parent a79dc9a8b5
commit 5981069012
8 changed files with 118 additions and 1 deletions

View File

@ -2339,6 +2339,23 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
image: "cr_pulse.png" COMP;
image: "cr_glow.png" COMP;
}
sounds {
sample { name: "key-tap1" LOSSY 64;
source: "kbd-tap.wav";
}
sample { name: "key-tap2" LOSSY 64;
source: "kbd-tap2.wav";
}
sample { name: "key-tap3" LOSSY 64;
source: "kbd-tap3.wav";
}
sample { name: "key-tap4" LOSSY 64;
source: "kbd-tap4.wav";
}
sample { name: "key-tap5" LOSSY 64;
source: "kbd-tap5.wav";
}
}
parts {
part { name: "key";
mouse_events: 0;
@ -2482,6 +2499,55 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
target: "glow";
target: "outline";
}
program {
signal: "key,down"; source: "terminology";
script {
#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 8)
new buf[32];
snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
run_program(get_program_id(buf));
#else
run_program(PROGRAM:"key-down4"); // chosen by a fair dice roll
// guaranteed to be random.
// http://xkcd.com/221/
#endif
}
}
program { name: "key-down1";
#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
action: PLAY_SAMPLE "key-tap1" 1.0 INPUT;
#else
action: PLAY_SAMPLE "key-tap1" 1.0;
#endif
}
program { name: "key-down2";
#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
action: PLAY_SAMPLE "key-tap2" 1.0 INPUT;
#else
action: PLAY_SAMPLE "key-tap2" 1.0;
#endif
}
program { name: "key-down3";
#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
action: PLAY_SAMPLE "key-tap3" 1.0 INPUT;
#else
action: PLAY_SAMPLE "key-tap3" 1.0;
#endif
}
program { name: "key-down4";
#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
action: PLAY_SAMPLE "key-tap4" 1.0 INPUT;
#else
action: PLAY_SAMPLE "key-tap4" 1.0;
#endif
}
program { name: "key-down5";
#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
action: PLAY_SAMPLE "key-tap5" 1.0 INPUT;
#else
action: PLAY_SAMPLE "key-tap5" 1.0;
#endif
}
program {
signal: "key,down"; source: "terminology";
action: STATE_SET "default" 0.0;

View File

@ -1105,6 +1105,23 @@ collections {
image: "cr_key.png" COMP;
image: "cr_out.png" COMP;
}
sounds {
sample { name: "key-tap1" LOSSY 64;
source: "kbd-tap.wav";
}
sample { name: "key-tap2" LOSSY 64;
source: "kbd-tap2.wav";
}
sample { name: "key-tap3" LOSSY 64;
source: "kbd-tap3.wav";
}
sample { name: "key-tap4" LOSSY 64;
source: "kbd-tap4.wav";
}
sample { name: "key-tap5" LOSSY 64;
source: "kbd-tap5.wav";
}
}
parts {
part { name: "pulsclip"; type: RECT;
description { state: "default" 0.0;
@ -1201,6 +1218,35 @@ collections {
target: "outline";
target: "pulsclip";
}
program {
signal: "key,down"; source: "terminology";
script {
#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 8)
new buf[32];
snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
run_program(get_program_id(buf));
#else
run_program(PROGRAM:"key-down4"); // chosen by a fair dice roll
// guaranteed to be random.
// http://xkcd.com/221/
#endif
}
}
program { name: "key-down1";
action: PLAY_SAMPLE "key-tap1" 1.0;
}
program { name: "key-down2";
action: PLAY_SAMPLE "key-tap2" 1.0;
}
program { name: "key-down3";
action: PLAY_SAMPLE "key-tap3" 1.0;
}
program { name: "key-down4";
action: PLAY_SAMPLE "key-tap4" 1.0;
}
program { name: "key-down5";
action: PLAY_SAMPLE "key-tap5" 1.0;
}
program { name: "key";
signal: "key,down";
source: "terminology";

View File

@ -1,3 +1,8 @@
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = \
bell.wav
bell.wav \
kbd-tap2.wav \
kbd-tap3.wav \
kbd-tap4.wav \
kbd-tap5.wav \
kbd-tap.wav

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.