diff --git a/MusiLib/MusiLib/DataContractPersistance/DataToPersist.cs b/MusiLib/MusiLib/DataContractPersistance/DataToPersist.cs new file mode 100644 index 0000000..89bb7f6 --- /dev/null +++ b/MusiLib/MusiLib/DataContractPersistance/DataToPersist.cs @@ -0,0 +1,15 @@ +using MusiLib.Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MusiLib.DataContractPersistance +{ + public class DataToPersist + { + public List utilisateurs = new List(); + public List partitions = new List(); + } +} diff --git a/MusiLib/MusiLib/Model/Metronome.cs b/MusiLib/MusiLib/Model/Metronome.cs index 314b2e1..3cdc267 100644 --- a/MusiLib/MusiLib/Model/Metronome.cs +++ b/MusiLib/MusiLib/Model/Metronome.cs @@ -1,32 +1,47 @@ -using System; +using Plugin.Maui.Audio; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace App.Models +namespace MusiLib.Model { - class Metronome + public class Metronome { - public void lancer() + static AudioPlayer player; + static bool isMusicPlaying = false; + static bool isMusicBeginning = false; + + public static async void beginMusic() { - //lancer la partition + player = (AudioPlayer)AudioManager.Current.CreatePlayer(await FileSystem.OpenAppPackageFileAsync("au_clair_de_la_lune.wav")); + player.Play(); + isMusicPlaying = true; + isMusicBeginning = true; } - public void arreter() + public static void playMusic() { - //mettre en pause la partition + player.Play(); + isMusicPlaying = true; } - public void reinitialiser() + public static void pauseMusic() { - //remettre la partition à 0 + player.Pause(); + isMusicPlaying = false; } - - public void regler() + public static void stopMusic() { - //régler la partition (volume, tempo ...) + if (isMusicBeginning) + { + player.Stop(); + isMusicPlaying = false; + isMusicBeginning = false; + } } - } + } + diff --git a/MusiLib/MusiLib/Views/IPlayMusic.cs b/MusiLib/MusiLib/Views/IPlayMusic.cs index bf5b386..9651b90 100644 --- a/MusiLib/MusiLib/Views/IPlayMusic.cs +++ b/MusiLib/MusiLib/Views/IPlayMusic.cs @@ -30,12 +30,12 @@ namespace MusiLib.Views public static void stopMusic() { - if(isMusicPlaying) + if(isMusicBeginning) { player.Stop(); + isMusicPlaying = false; + isMusicBeginning = false; } - isMusicPlaying = false; - isMusicBeginning = false; } } diff --git a/MusiLib/MusiLib/Views/Partition.xaml b/MusiLib/MusiLib/Views/Partition.xaml index b4dfcab..b532870 100644 --- a/MusiLib/MusiLib/Views/Partition.xaml +++ b/MusiLib/MusiLib/Views/Partition.xaml @@ -60,6 +60,7 @@ HeightRequest="75" HorizontalOptions="Start" Clicked="Play_Music" + x:Name="play_music_button" />