diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1cdd68e..b242391 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,8 @@ package="com.iutlaval.myapplication"> + + soundMap; + private int loopMusic; + private SoundPool soundPool; + private MediaPlayer backgroundMusicPlayer; + //si mise a true alors le thread va envoyer un message au serveur lui disant de passer a la phase suivante private boolean requestEnd = false; @@ -108,9 +119,45 @@ public class GameLogicThread extends Thread{ bitmapBackground = BitmapFactory.decodeResource(cont.getResources(), R.drawable.t_b_board_background); }else{ bitmapBackground = BitmapFactory.decodeResource(cont.getResources(), R.drawable.t_b_board_background_handicapted); - } + final int maxAudioStream = 2; + if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { + //déprecier aprés android lolipop + soundPool = new SoundPool(maxAudioStream, AudioManager.STREAM_MUSIC,100); + }else{ + SoundPool.Builder builder = new SoundPool.Builder(); + builder.setMaxStreams(maxAudioStream); + soundPool = builder.build(); + } + soundPool.setOnLoadCompleteListener(this); + + + int startSound; + switch (deckName.trim()) + { + default: + Log.e("Music","unrecognized deck loading default"); + case "mythes et legendes grecs": + startSound=R.raw.mytes_start; + loopMusic =R.raw.mytes_loop; + break; + case "moyen-age francais": + startSound=R.raw.moyenage_start; + loopMusic =R.raw.moyenage_loop; + break; + case "renaissance": + startSound=R.raw.renaissence_start; + loopMusic =R.raw.renaissence_loop; + break; + } + backgroundMusicPlayer = MediaPlayer.create(cont,startSound); + backgroundMusicPlayer.setOnCompletionListener(this); + backgroundMusicPlayer.setScreenOnWhilePlaying(true); + backgroundMusicPlayer.start(); + + + Log.i("ressources","base ressources loaded"); //adding the background @@ -574,4 +621,16 @@ public class GameLogicThread extends Thread{ } + @Override + public void onLoadComplete(final SoundPool soundPool, int sampleId, int status) { + + } + + @Override + public void onCompletion(MediaPlayer mp) { + mp.reset(); + backgroundMusicPlayer = MediaPlayer.create(cont, loopMusic); + backgroundMusicPlayer.start(); + backgroundMusicPlayer.setLooping(true); + } } diff --git a/app/src/main/res/raw/moyenage_loop.mp3 b/app/src/main/res/raw/moyenage_loop.mp3 new file mode 100644 index 0000000..49bb6a9 Binary files /dev/null and b/app/src/main/res/raw/moyenage_loop.mp3 differ diff --git a/app/src/main/res/raw/moyenage_start.mp3 b/app/src/main/res/raw/moyenage_start.mp3 new file mode 100644 index 0000000..3180956 Binary files /dev/null and b/app/src/main/res/raw/moyenage_start.mp3 differ diff --git a/app/src/main/res/raw/mytes_loop.mp3 b/app/src/main/res/raw/mytes_loop.mp3 new file mode 100644 index 0000000..7bd646b Binary files /dev/null and b/app/src/main/res/raw/mytes_loop.mp3 differ diff --git a/app/src/main/res/raw/mytes_start.mp3 b/app/src/main/res/raw/mytes_start.mp3 new file mode 100644 index 0000000..f0973c6 Binary files /dev/null and b/app/src/main/res/raw/mytes_start.mp3 differ diff --git a/app/src/main/res/raw/renaissence_loop.mp3 b/app/src/main/res/raw/renaissence_loop.mp3 new file mode 100644 index 0000000..5597063 Binary files /dev/null and b/app/src/main/res/raw/renaissence_loop.mp3 differ diff --git a/app/src/main/res/raw/renaissence_start.mp3 b/app/src/main/res/raw/renaissence_start.mp3 new file mode 100644 index 0000000..1896276 Binary files /dev/null and b/app/src/main/res/raw/renaissence_start.mp3 differ