Skip to content

Commit

Permalink
test audio
Browse files Browse the repository at this point in the history
  • Loading branch information
N3mesis98 committed Oct 8, 2013
1 parent e654671 commit 487ee8b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions main.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<link rel="stylesheet" href="style/style.css" />
<title>La Séparation</title>

<!-- <script type="text/javascript" src="phonegap.js"></script> -->
<script type="text/javascript" src="phonegap.js"></script>

<!-- scripts/libs -->
<script type="text/javascript" src="scripts/libs/jquery-2.0.2.min.js"></script>
<script type="text/javascript" src="scripts/libs/kinetic-v4.6.0.min.js"></script>

<!-- scripts/libs/separation_toolkit -->
<script defer type="text/javascript" src="scripts/libs/separation_toolkit/intro.js"></script>

<!-- scripts/libs/separation_toolkit/word -->
<script type="text/javascript" src="scripts/libs/separation_toolkit/word/constantes.js"></script>
<script defer type="text/javascript" src="scripts/libs/separation_toolkit/word/word.js"></script>
Expand Down
10 changes: 5 additions & 5 deletions scripts/libs/separation_toolkit/sound/sound_play.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
function sound_play(name) {
// if (appOnDevice()) {
// sounds[name].play();
// }
// else {
if (appOnDevice()) {
sounds[name].play();
}
else {
document.getElementById(name).play();
// }
}
}
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("sounds/cut.wav");
sounds["rub"] = new Media("sounds/rub.wav");
sounds["tear"] = new Media("sounds/tear.wav");
sounds["ambiant"] = new Media("sounds/ambiant.wav");
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");
}
}

Expand Down
4 changes: 2 additions & 2 deletions scripts/main/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ function checkDevice() {
initImages();
initSounds();

//introductionStage();
introductionStage();
//initMainMenu();
Recit.start();
//Recit.start();

stage.add(mainLayer);
stage.add(actionLayer);
Expand Down

0 comments on commit 487ee8b

Please sign in to comment.