Skip to content

Commit

Permalink
audio tablettes réparé
Browse files Browse the repository at this point in the history
  • Loading branch information
N3mesis98 committed Oct 8, 2013
1 parent 487ee8b commit fc0da8d
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions main.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@
<div id="main">
</div>
<div id="sound">
<audio id="ambiant" src="sounds/ambiant.wav" loop></audio>
<audio id="rub" src="sounds/rub.wav"></audio>
<audio id="tear" src="sounds/tear.wav"></audio>
<audio id="cut" src="sounds/cut.wav"></audio>
<audio id="ambiant" src="sounds/ambiant.ogg" loop></audio>
<audio id="rub" src="sounds/rub.ogg"></audio>
<audio id="tear" src="sounds/tear.ogg"></audio>
<audio id="cut" src="sounds/cut.ogg"></audio>
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion scripts/libs/separation_toolkit/intro.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

function appOnDevice() {
return false;
return true;
}

var events = {
Expand Down
8 changes: 4 additions & 4 deletions scripts/main/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ function initImages() {

function initSounds() {
if (appOnDevice()) {
sounds["cut"] = new Media("/android_asset/www/sounds/cut.wav");
sounds["rub"] = new Media("/android_asset/www/sounds/rub.wav");
sounds["tear"] = new Media("/android_asset/www/sounds/tear.wav");
sounds["ambiant"] = new Media("/android_asset/www/sounds/ambiant.wav");
sounds["cut"] = new Media("/android_asset/www/sounds/cut.ogg");
sounds["rub"] = new Media("/android_asset/www/sounds/rub.ogg");
sounds["tear"] = new Media("/android_asset/www/sounds/tear.ogg");
sounds["ambiant"] = new Media("/android_asset/www/sounds/ambiant.ogg");
}
}

Expand Down
12 changes: 6 additions & 6 deletions scripts/recit/recit.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
*/
var Recit = {};
var rct; // RecitConsTantes (RCT) : Constantes (taille de la police, etc.) utilisées pour le récit
var DEBUG = true;
var DEBUG = false;

/*
Point d'entrée du récit
*/
Recit.start = function() {
clearStage();

this.computeSizes();
if(DEBUG) this.addLines();

var sentence = new Sentence();

sentence.add(new Word('LA'));
sentence.addSpace();
sentence.add(new Word('SEPARATION'));
Expand All @@ -24,7 +24,7 @@ Recit.start = function() {
sentence.add(new Word('CLEF'));
sentence.addTab();
sentence.add(new Word('CIEL'));

sentence.generate(12);
sentence.display(mainLayer);

Expand Down Expand Up @@ -57,4 +57,4 @@ Recit.addLines = function() {
});
mainLayer.add(rect);
}
}
}
Binary file removed sounds/ambiant.wav
Binary file not shown.
Binary file removed sounds/cut.wav
Binary file not shown.
Binary file removed sounds/rub.wav
Binary file not shown.
Binary file removed sounds/tear.wav
Binary file not shown.

0 comments on commit fc0da8d

Please sign in to comment.