From 1017209a51ee282cfefed05ad5d3416d65123dba Mon Sep 17 00:00:00 2001 From: Guillaume REY Date: Wed, 10 May 2023 08:22:00 +0200 Subject: [PATCH] correction de l'audio --- Sources/Ohara/MainPage.xaml.cs | 43 ++++++----- Sources/Ohara/PageBateau.xaml.cs | 37 +++++---- Sources/Ohara/PageBestiaire.xaml.cs | 4 +- Sources/Ohara/PageCarte.xaml.cs | 4 +- Sources/Ohara/PageEquipage.xaml.cs | 4 +- Sources/Ohara/PageFDD.xaml.cs | 4 +- Sources/Ohara/PageIle.xaml.cs | 4 +- Sources/Ohara/PageInfoBateau.xaml.cs | 4 +- Sources/Ohara/PageInfoBestiaire.xaml.cs | 4 +- Sources/Ohara/PageInfoEquipage.xaml.cs | 4 +- Sources/Ohara/PageInfoFdd.xaml.cs | 96 ++++++++++++------------ Sources/Ohara/PageInfoIle.xaml.cs | 4 +- Sources/Ohara/PageInfoPersonnage.xaml.cs | 4 +- Sources/Ohara/PagePersonnage.xaml.cs | 4 +- 14 files changed, 120 insertions(+), 100 deletions(-) diff --git a/Sources/Ohara/MainPage.xaml.cs b/Sources/Ohara/MainPage.xaml.cs index 953a5b0..6efee28 100644 --- a/Sources/Ohara/MainPage.xaml.cs +++ b/Sources/Ohara/MainPage.xaml.cs @@ -5,60 +5,69 @@ namespace Ohara; public partial class MainPage : ContentPage { - - public MainPage() + private readonly IAudioManager audioManager; + private static string chemin = "Sons/test.wav"; + + public MainPage(IAudioManager audioManager) { InitializeComponent(); - } + this.audioManager = audioManager; + } private async void Hyperlink_Accueil(object sender, EventArgs e) { - - await Navigation.PushAsync(new MainPage()); - + var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); + await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager())); + player.Play(); } private async void Hyperlink_FDD(object sender, EventArgs e) { - + var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); await Navigation.PushAsync(new PageFDD()); - + player.Play(); + } private async void Hyperlink_Equip(object sender, EventArgs e) { - + var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); await Navigation.PushAsync(new PageEquipage()); + player.Play(); } private async void Hyperlink_Perso(object sender, EventArgs e) { + var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); await Navigation.PushAsync(new PagePersonnage()); + player.Play(); } private async void Hyperlink_Carte(object sender, EventArgs e) { - + var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); await Navigation.PushAsync(new PageCarte()); - + player.Play(); + } private async void Hyperlink_Bateau(object sender, EventArgs e) { - await Navigation.PushAsync(new PageBateau()); + var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); + await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager())); + player.Play(); } private async void Hyperlink_Bestiaire(object sender, EventArgs e) { - + var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); await Navigation.PushAsync(new PageBestiaire()); - + player.Play(); } private async void Hyperlink_Ile(object sender, EventArgs e) { - + var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); await Navigation.PushAsync(new PageIle()); - + player.Play(); } } - diff --git a/Sources/Ohara/PageBateau.xaml.cs b/Sources/Ohara/PageBateau.xaml.cs index 014da4b..ee455c5 100644 --- a/Sources/Ohara/PageBateau.xaml.cs +++ b/Sources/Ohara/PageBateau.xaml.cs @@ -1,61 +1,72 @@ using Model.Stub; using Model; - +using Plugin.Maui.Audio; namespace Ohara; public partial class PageBateau : ContentPage { - + private readonly IAudioManager audioManager; + private static string chemin = "Sons/test.wav"; - public PageBateau() + public PageBateau(IAudioManager audioManager) { InitializeComponent(); var manager = new Manager(); listeBateau.ItemsSource = manager.GetBateaux(); + this.audioManager = audioManager; } + private async void Hyperlink_Accueil(object sender, EventArgs e) { - await Navigation.PushAsync(new MainPage()); + var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); + await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager())); + player.Play(); } private async void Hyperlink_FDD(object sender, EventArgs e) { - + var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); await Navigation.PushAsync(new PageFDD()); - + player.Play(); } private async void Hyperlink_Equip(object sender, EventArgs e) { - + var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); await Navigation.PushAsync(new PageEquipage()); - + player.Play(); } private async void Hyperlink_Perso(object sender, EventArgs e) { - + var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); await Navigation.PushAsync(new PagePersonnage()); - + player.Play(); } private async void Hyperlink_Carte(object sender, EventArgs e) { - + var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); await Navigation.PushAsync(new PageCarte()); - + player.Play(); } private async void Hyperlink_Bateau(object sender, EventArgs e) { - await Navigation.PushAsync(new PageBateau()); + var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); + await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager())); + player.Play(); } private async void Hyperlink_Bestiaire(object sender, EventArgs e) { + var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); await Navigation.PushAsync(new PageBestiaire()); + player.Play(); } private async void Hyperlink_Ile(object sender, EventArgs e) { + var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin)); await Navigation.PushAsync(new PageIle()); + player.Play(); } } \ No newline at end of file diff --git a/Sources/Ohara/PageBestiaire.xaml.cs b/Sources/Ohara/PageBestiaire.xaml.cs index fd0b54b..ceef83b 100644 --- a/Sources/Ohara/PageBestiaire.xaml.cs +++ b/Sources/Ohara/PageBestiaire.xaml.cs @@ -17,7 +17,7 @@ public partial class PageBestiaire : ContentPage } private async void Hyperlink_Accueil(object sender, EventArgs e) { - await Navigation.PushAsync(new MainPage()); + await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_FDD(object sender, EventArgs e) @@ -35,7 +35,7 @@ public partial class PageBestiaire : ContentPage } private async void Hyperlink_Bateau(object sender, EventArgs e) { - await Navigation.PushAsync(new PageBateau()); + await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_Perso(object sender, EventArgs e) diff --git a/Sources/Ohara/PageCarte.xaml.cs b/Sources/Ohara/PageCarte.xaml.cs index e3e866a..35a15b7 100644 --- a/Sources/Ohara/PageCarte.xaml.cs +++ b/Sources/Ohara/PageCarte.xaml.cs @@ -8,7 +8,7 @@ public partial class PageCarte : ContentPage } private async void Hyperlink_Accueil(object sender, EventArgs e) { - await Navigation.PushAsync(new MainPage()); + await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_FDD(object sender, EventArgs e) @@ -27,7 +27,7 @@ public partial class PageCarte : ContentPage } private async void Hyperlink_Bateau(object sender, EventArgs e) { - await Navigation.PushAsync(new PageBateau()); + await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_Bestiaire(object sender, EventArgs e) diff --git a/Sources/Ohara/PageEquipage.xaml.cs b/Sources/Ohara/PageEquipage.xaml.cs index 831ed93..96d87d1 100644 --- a/Sources/Ohara/PageEquipage.xaml.cs +++ b/Sources/Ohara/PageEquipage.xaml.cs @@ -12,7 +12,7 @@ public partial class PageEquipage : ContentPage } private async void Hyperlink_Accueil(object sender, EventArgs e) { - await Navigation.PushAsync(new MainPage()); + await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_FDD(object sender, EventArgs e) @@ -31,7 +31,7 @@ public partial class PageEquipage : ContentPage } private async void Hyperlink_Bateau(object sender, EventArgs e) { - await Navigation.PushAsync(new PageBateau()); + await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_Bestiaire(object sender, EventArgs e) diff --git a/Sources/Ohara/PageFDD.xaml.cs b/Sources/Ohara/PageFDD.xaml.cs index 8ec2ed0..41e6d98 100644 --- a/Sources/Ohara/PageFDD.xaml.cs +++ b/Sources/Ohara/PageFDD.xaml.cs @@ -40,7 +40,7 @@ public partial class PageFDD : ContentPage private async void Hyperlink_Accueil(object sender, EventArgs e) { - await Navigation.PushAsync(new MainPage()); + await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_Equip(object sender, EventArgs e) @@ -58,7 +58,7 @@ public partial class PageFDD : ContentPage } private async void Hyperlink_Bateau(object sender, EventArgs e) { - await Navigation.PushAsync(new PageBateau()); + await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_Bestiaire(object sender, EventArgs e) { diff --git a/Sources/Ohara/PageIle.xaml.cs b/Sources/Ohara/PageIle.xaml.cs index 97b3a1c..b99383b 100644 --- a/Sources/Ohara/PageIle.xaml.cs +++ b/Sources/Ohara/PageIle.xaml.cs @@ -21,7 +21,7 @@ public partial class PageIle : ContentPage private async void Hyperlink_Accueil(object sender, EventArgs e) { - await Navigation.PushAsync(new MainPage()); + await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_Equip(object sender, EventArgs e) @@ -42,7 +42,7 @@ public partial class PageIle : ContentPage } private async void Hyperlink_Bateau(object sender, EventArgs e) { - await Navigation.PushAsync(new PageBateau()); + await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_Bestiaire(object sender, EventArgs e) { diff --git a/Sources/Ohara/PageInfoBateau.xaml.cs b/Sources/Ohara/PageInfoBateau.xaml.cs index a2e1349..f1da1c1 100644 --- a/Sources/Ohara/PageInfoBateau.xaml.cs +++ b/Sources/Ohara/PageInfoBateau.xaml.cs @@ -16,7 +16,7 @@ public partial class PageInfoBateau : ContentPage private async void Hyperlink_Accueil(object sender, EventArgs e) { - await Navigation.PushAsync(new MainPage()); + await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_FDD(object sender, EventArgs e) @@ -34,7 +34,7 @@ public partial class PageInfoBateau : ContentPage } private async void Hyperlink_Bateau(object sender, EventArgs e) { - await Navigation.PushAsync(new PageBateau()); + await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_Bestiaire(object sender, EventArgs e) diff --git a/Sources/Ohara/PageInfoBestiaire.xaml.cs b/Sources/Ohara/PageInfoBestiaire.xaml.cs index f7508b0..ab1828c 100644 --- a/Sources/Ohara/PageInfoBestiaire.xaml.cs +++ b/Sources/Ohara/PageInfoBestiaire.xaml.cs @@ -16,7 +16,7 @@ public partial class PageInfoBestiaire : ContentPage private async void Hyperlink_Accueil(object sender, EventArgs e) { - await Navigation.PushAsync(new MainPage()); + await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_FDD(object sender, EventArgs e) @@ -34,7 +34,7 @@ public partial class PageInfoBestiaire : ContentPage } private async void Hyperlink_Bateau(object sender, EventArgs e) { - await Navigation.PushAsync(new PageBateau()); + await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_Bestiaire(object sender, EventArgs e) diff --git a/Sources/Ohara/PageInfoEquipage.xaml.cs b/Sources/Ohara/PageInfoEquipage.xaml.cs index 96c7a91..9876842 100644 --- a/Sources/Ohara/PageInfoEquipage.xaml.cs +++ b/Sources/Ohara/PageInfoEquipage.xaml.cs @@ -17,7 +17,7 @@ public partial class PageInfoEquipage : ContentPage } private async void Hyperlink_Accueil(object sender, EventArgs e) { - await Navigation.PushAsync(new MainPage()); + await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_FDD(object sender, EventArgs e) @@ -35,7 +35,7 @@ public partial class PageInfoEquipage : ContentPage } private async void Hyperlink_Bateau(object sender, EventArgs e) { - await Navigation.PushAsync(new PageBateau()); + await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_Bestiaire(object sender, EventArgs e) diff --git a/Sources/Ohara/PageInfoFdd.xaml.cs b/Sources/Ohara/PageInfoFdd.xaml.cs index 6a45580..e8927fb 100644 --- a/Sources/Ohara/PageInfoFdd.xaml.cs +++ b/Sources/Ohara/PageInfoFdd.xaml.cs @@ -1,51 +1,51 @@ -using Model; -using Model.Stub; - -namespace Ohara; - -public partial class PageInfoFdd : ContentPage -{ - public PageInfoFdd() - { - InitializeComponent(); +using Model; +using Model.Stub; + +namespace Ohara; + +public partial class PageInfoFdd : ContentPage +{ + public PageInfoFdd() + { + InitializeComponent(); var manager = new Manager(); listObj.ItemsSource = manager.GetFruits(); - } - - private async void Hyperlink_Accueil(object sender, EventArgs e) - { - await Navigation.PushAsync(new MainPage()); - } - - private async void Hyperlink_FDD(object sender, EventArgs e) - { - await Navigation.PushAsync(new PageFDD()); - } - - private async void Hyperlink_Equip(object sender, EventArgs e) - { - await Navigation.PushAsync(new PageEquipage()); - } - private async void Hyperlink_Carte(object sender, EventArgs e) - { - await Navigation.PushAsync(new PageCarte()); - } - private async void Hyperlink_Bateau(object sender, EventArgs e) - { - await Navigation.PushAsync(new PageBateau()); - } - - private async void Hyperlink_Bestiaire(object sender, EventArgs e) - { - await Navigation.PushAsync(new PageBestiaire()); - } - private async void Hyperlink_Ile(object sender, EventArgs e) - { - await Navigation.PushAsync(new PageIle()); - } - - private async void Hyperlink_Perso(object sender, EventArgs e) - { - await Navigation.PushAsync(new PagePersonnage()); - } + } + + private async void Hyperlink_Accueil(object sender, EventArgs e) + { + await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager())); + } + + private async void Hyperlink_FDD(object sender, EventArgs e) + { + await Navigation.PushAsync(new PageFDD()); + } + + private async void Hyperlink_Equip(object sender, EventArgs e) + { + await Navigation.PushAsync(new PageEquipage()); + } + private async void Hyperlink_Carte(object sender, EventArgs e) + { + await Navigation.PushAsync(new PageCarte()); + } + private async void Hyperlink_Bateau(object sender, EventArgs e) + { + await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager())); + } + + private async void Hyperlink_Bestiaire(object sender, EventArgs e) + { + await Navigation.PushAsync(new PageBestiaire()); + } + private async void Hyperlink_Ile(object sender, EventArgs e) + { + await Navigation.PushAsync(new PageIle()); + } + + private async void Hyperlink_Perso(object sender, EventArgs e) + { + await Navigation.PushAsync(new PagePersonnage()); + } } \ No newline at end of file diff --git a/Sources/Ohara/PageInfoIle.xaml.cs b/Sources/Ohara/PageInfoIle.xaml.cs index f6f10e1..0e667bc 100644 --- a/Sources/Ohara/PageInfoIle.xaml.cs +++ b/Sources/Ohara/PageInfoIle.xaml.cs @@ -16,7 +16,7 @@ public partial class PageInfoIle : ContentPage private async void Hyperlink_Accueil(object sender, EventArgs e) { - await Navigation.PushAsync(new MainPage()); + await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_FDD(object sender, EventArgs e) @@ -34,7 +34,7 @@ public partial class PageInfoIle : ContentPage } private async void Hyperlink_Bateau(object sender, EventArgs e) { - await Navigation.PushAsync(new PageBateau()); + await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_Bestiaire(object sender, EventArgs e) diff --git a/Sources/Ohara/PageInfoPersonnage.xaml.cs b/Sources/Ohara/PageInfoPersonnage.xaml.cs index 1a6f9cd..e10c442 100644 --- a/Sources/Ohara/PageInfoPersonnage.xaml.cs +++ b/Sources/Ohara/PageInfoPersonnage.xaml.cs @@ -16,7 +16,7 @@ public partial class PageInfoPersonnage : ContentPage } private async void Hyperlink_Accueil(object sender, EventArgs e) { - await Navigation.PushAsync(new MainPage()); + await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_FDD(object sender, EventArgs e) @@ -34,7 +34,7 @@ public partial class PageInfoPersonnage : ContentPage } private async void Hyperlink_Bateau(object sender, EventArgs e) { - await Navigation.PushAsync(new PageBateau()); + await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_Bestiaire(object sender, EventArgs e) diff --git a/Sources/Ohara/PagePersonnage.xaml.cs b/Sources/Ohara/PagePersonnage.xaml.cs index f23df4b..02723d4 100644 --- a/Sources/Ohara/PagePersonnage.xaml.cs +++ b/Sources/Ohara/PagePersonnage.xaml.cs @@ -19,7 +19,7 @@ public partial class PagePersonnage : ContentPage private async void Hyperlink_Accueil(object sender, EventArgs e) { - await Navigation.PushAsync(new MainPage()); + await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_FDD(object sender, EventArgs e) @@ -37,7 +37,7 @@ public partial class PagePersonnage : ContentPage } private async void Hyperlink_Bateau(object sender, EventArgs e) { - await Navigation.PushAsync(new PageBateau()); + await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager())); } private async void Hyperlink_Bestiaire(object sender, EventArgs e)