Hi Rastee,

I don't think it is explicit that the "mute effects" impacts on
terminology sound and only on that. A config inside terminology should
be easier for people.

JackDanielZ, alias me.

On 07/07/2014 10:31 AM, Carsten Haitzler wrote:
> raster pushed a commit to branch master.
>
> http://git.enlightenment.org/apps/terminology.git/commit/?id=5981069012d938b2ace2f5a5da3f201d73e08d1e
>
> commit 5981069012d938b2ace2f5a5da3f201d73e08d1e
> Author: Carsten Haitzler (Rasterman) <[email protected]>
> Date:   Mon Jul 7 16:30:57 2014 +0900
>
>     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
> ---
>  data/themes/default.edc         |  66 
> ++++++++++++++++++++++++++++++++++++++++
>  data/themes/mild.edc            |  46 ++++++++++++++++++++++++++++
>  data/themes/sounds/Makefile.am  |   7 ++++-
>  data/themes/sounds/kbd-tap.wav  | Bin 0 -> 15668 bytes
>  data/themes/sounds/kbd-tap2.wav | Bin 0 -> 20848 bytes
>  data/themes/sounds/kbd-tap3.wav | Bin 0 -> 22024 bytes
>  data/themes/sounds/kbd-tap4.wav | Bin 0 -> 26784 bytes
>  data/themes/sounds/kbd-tap5.wav | Bin 0 -> 22528 bytes
>  8 files changed, 118 insertions(+), 1 deletion(-)
>
> 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:
>          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;
> @@ -2484,6 +2501,55 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; 
> target: "3.clip"; target:
>              }
>              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;
>                 target: "key";
>                 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 {
>          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";
> 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 @@
>  MAINTAINERCLEANFILES = Makefile.in
>  EXTRA_DIST = \
> -bell.wav
> +bell.wav \
> +kbd-tap2.wav \
> +kbd-tap3.wav \
> +kbd-tap4.wav \
> +kbd-tap5.wav \
> +kbd-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
> Binary files /dev/null and b/data/themes/sounds/kbd-tap.wav differ
> diff --git a/data/themes/sounds/kbd-tap2.wav b/data/themes/sounds/kbd-tap2.wav
> new file mode 100644
> index 0000000..8ca8d0a
> Binary files /dev/null and b/data/themes/sounds/kbd-tap2.wav differ
> diff --git a/data/themes/sounds/kbd-tap3.wav b/data/themes/sounds/kbd-tap3.wav
> new file mode 100644
> index 0000000..849fa1c
> Binary files /dev/null and b/data/themes/sounds/kbd-tap3.wav differ
> diff --git a/data/themes/sounds/kbd-tap4.wav b/data/themes/sounds/kbd-tap4.wav
> new file mode 100644
> index 0000000..eecd4e3
> Binary files /dev/null and b/data/themes/sounds/kbd-tap4.wav differ
> diff --git a/data/themes/sounds/kbd-tap5.wav b/data/themes/sounds/kbd-tap5.wav
> new file mode 100644
> index 0000000..a2dc79b
> Binary files /dev/null and b/data/themes/sounds/kbd-tap5.wav differ
>


------------------------------------------------------------------------------
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to