Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 2 contributors
Commits on Apr 02, 2013
@yzen yzen FLUID-4947: Switched to fireworks over google tts. 408591c
@michelled michelled Merge remote-tracking branch 'yzen/demo' into demo
* yzen/demo:
  FLUID-4947: Switched to fireworks over google tts.
0b6421a
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) {

No commit comments for this range

Something went wrong with that request. Please try again.