Permalink
Browse files

Merge remote-tracking branch 'yzen/demo' into demo

* yzen/demo:
  FLUID-4947: Switched to fireworks over google tts.
  • Loading branch information...
2 parents 368c39e + 408591c commit 0b6421ae30c86b4965a92fca076cfe96f45044fc @michelled michelled committed Apr 2, 2013
Showing with 5 additions and 3 deletions.
  1. +5 −3 src/webapp/integration-demos/uiOptions/js/SelfVoicingEnactor.js
View
8 src/webapp/integration-demos/uiOptions/js/SelfVoicingEnactor.js
@@ -77,11 +77,13 @@ var fluid_1_5 = fluid_1_5 || {};
// HTML5 Audio configuration
audioSelector: "#selfVoicer-audio",
- markup: '<audio type="audio/mpeg"></audio>',
+ markup: '<audio type="audio/x-wav"></audio>',
+ // Fireworks Server
+ ttsUrl: "http://ec2-23-23-52-224.compute-1.amazonaws.com?q=%text"
// Google Translate TTS Proxy
- lang: "en",
- ttsUrl: "http://ec2-23-23-52-224.compute-1.amazonaws.com?q=%text&tl=%lang"
+ // lang: "en",
+ // ttsUrl: "http://ec2-23-23-52-224.compute-1.amazonaws.com?q=%text&tl=%lang"
});
fluid.uiOptions.actionAnts.selfVoicingEnactor.finalInit = function (that) {

0 comments on commit 0b6421a

Please sign in to comment.