enable espeak options

kripken · Aug 2, 2011 · 3e2a4c1 · 3e2a4c1
1 parent 8f64634
commit 3e2a4c1
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 57 deletions.
diff --git a/README.markdown b/README.markdown
@@ -27,18 +27,45 @@ Very simple! Do this:
 
       `speak('hello world!')`
 
-See demo.html for an example use.
+See demo.min.html for a simple 'hello world', and demo.full.html for
+a more detailed example.
+
+
+Options
+-------
+
+You can also specify some options with calling speak(), by doing
+
+      `speak('hello world', { option1: value1, option2: value2 .. })`
+
+available options are:
+
+ * amplitude: How loud the voice will be (default: 100)
+ * pitch: The voice pitch (default: 50)
+ * speed: The speed at which to talk (words per minute) (default: 175)
+ * voice: Which voice to use (requires you to bundle it - currently you
+          wil need to build speak.js yourself for that) (default: en/en-us)
+ * wordgap: Additional gap between words in 10 ms units (default: 0)
+
+For example
+
+      `speak('hello world', { pitch: 100 })`
+
+will talk in a very high-pitched voice.
 
 
 Building
 --------
 
-Run emscripten.sh inside src/. Note that you need to change the paths there.
+A prebuilt version is already included, in the file speak.js. But if you want
+to tinker with the source code though, you might want to build it yourself.
+To do so, run emscripten.sh inside src/. Note that you need to change the paths
+there.
 
 That will generate speak.full.js, which is the unminified version. It is
 recommended to minify that (for example, using the closure compiler). speak.js
 in this repo is minified.
 
-demo.full.html is the same as demo.html but uses speak.full.js. It is useful
-for testing.
+demo.full.html uses speak.full.js (the unminified version) while demo.min.js
+uses speak.js (the minified version).
 
diff --git a/demo.full.html b/demo.full.html
@@ -1,22 +1,27 @@
 <html>
-<title>Text-to-Speech on the Web</title>
+<title>speak.js: Text-to-Speech on the Web</title>
 <head>
   <script>
     // This demo is licensed under the GNU GPL.
   </script>
   <script src="speak.full.js"></script>
 </head>
 <body>
-  <h1>Text-To-Speech on the Web</h1>
-
-  <form onsubmit="speak(text.value); return false">
-    Text: <input type="text" name="text" size=50 value="Never gonna give, you, up."><input type="submit" value="Go!">
+  <h1>speak.js</h1>
+  <h2>Text-To-Speech on the Web</h2>
+  <form onsubmit="speak(text.value, { amplitude: amplitude.value, wordgap: workdgap.value, pitch: pitch.value, speed: speed.value }); return false">
+    Text: <input type="text" name="text" size=50 value="Never gonna give, you, up.">
+    Amplitude: <input type="text" name="amplitude" size=5 value="100">
+    Pitch: <input type="text" name="pitch" size=5 value="50">
+    Speed: <input type="text" name="speed" size=5 value="175">
+    Word gap: <input type="text" name="workdgap" size=5 value="0">
+    <input type="submit" value="Go!">
   </form>
   <hr>
   <p>
     This demo is 100% clientside JavaScript. It uses <a href="http://espeak.sourceforge.net/">eSpeak</a>, an open source
     speech synthesizer, which was compiled from C++ to JavaScript using <a href="http://emscripten.org">Emscripten</a>.
-    Source code for this demo can be found <a href="espeak_src.tar.bz2">here</a>.
+    Source code for this demo can be found <a href="https://github.com/kripken/speak.js">here</a>.
   </p>
 
   <p>

diff --git a/demo.html b/demo.html
diff --git a/demo.min.html b/demo.min.html
@@ -0,0 +1,10 @@
+<html>
+  <head>
+    <script src="speak.js"></script>
+  </head>
+  <body>
+    <button onclick="speak('hello world')">Talk</button>
+    <div id="audio"></div>
+  </body>
+</html>
+
diff --git a/speak.full.js b/speak.full.js
@@ -6,7 +6,6 @@ var speak = (function() {
   var print = console.log;
 
   var Module = {
-    arguments: ['-w', 'wav.wav', '-v', 'en/en-us', '--path=/espeak'],
     noInitialRun: true
   };
 
@@ -18940,7 +18939,7 @@ var _llvm_dbg_declare; // stub for _llvm_dbg_declare
 
   var _stdout=0;
 
-  var _stderr=0;var FS={"root":{"read":true,"write":false,"isFolder":true,"isDevice":false,"timestamp":"2011-08-02T18:43:27.128Z","inodeNumber":1,"contents":{}},"currentPath":"/","nextInode":2,"cmask":511,"streams":[null],"ignorePermissions":true, absolutePath: function (relative, base) {
+  var _stderr=0;var FS={"root":{"read":true,"write":false,"isFolder":true,"isDevice":false,"timestamp":"2011-08-02T20:49:28.477Z","inodeNumber":1,"contents":{}},"currentPath":"/","nextInode":2,"cmask":511,"streams":[null],"ignorePermissions":true, absolutePath: function (relative, base) {
         if (typeof relative !== 'string') return null;
         if (base === undefined) base = FS.currentPath;
         if (relative && relative[0] == '/') base = '';
@@ -120057,8 +120056,21 @@ if (!Module['noInitialRun']) {
 
   FS.root.write = true;
 
-  function speak(text) {
-    Module.arguments.push(text);
+  function speak(text, args) {
+    args = args || {};
+    Module.arguments = [
+      '-w', 'wav.wav',
+      // options
+      '-a', args.amplitude ? String(args.amplitude) : '100',
+      '-g', args.wordgap ? String(args.wordgap) : '0', // XXX
+      '-p', args.pitch ? String(args.pitch) : '50',
+      '-s', args.speed ? String(args.speed) : '175',
+      '-v', args.voice ? String(args.voice) : 'en/en-us',
+      // end options
+      '--path=/espeak',
+      text
+    ];
+
     run();
     Module.arguments.pop();
 

diff --git a/src/post.js b/src/post.js
@@ -9,8 +9,21 @@
 
   FS.root.write = true;
 
-  function speak(text) {
-    Module.arguments.push(text);
+  function speak(text, args) {
+    args = args || {};
+    Module.arguments = [
+      '-w', 'wav.wav',
+      // options
+      '-a', args.amplitude ? String(args.amplitude) : '100',
+      '-g', args.wordgap ? String(args.wordgap) : '0', // XXX
+      '-p', args.pitch ? String(args.pitch) : '50',
+      '-s', args.speed ? String(args.speed) : '175',
+      '-v', args.voice ? String(args.voice) : 'en/en-us',
+      // end options
+      '--path=/espeak',
+      text
+    ];
+
     run();
     Module.arguments.pop();
 

diff --git a/src/pre.js b/src/pre.js
@@ -6,7 +6,6 @@ var speak = (function() {
   var print = console.log;
 
   var Module = {
-    arguments: ['-w', 'wav.wav', '-v', 'en/en-us', '--path=/espeak'],
     noInitialRun: true
   };