From 1cd31bc2a10210134121442c9878072c5c3eba17 Mon Sep 17 00:00:00 2001 From: ZIRTR0X <76250995+ZIRTR0X@users.noreply.github.com> Date: Sat, 11 Dec 2021 10:38:16 +0100 Subject: [PATCH] Musique fini --- .../code/fxml/ConfigurationMenu.fxml | 24 ++++++------- .../code/fxml/GameConfigurationMenu.fxml | 32 ++++++++++++------ .../code/image/personnage/Perso2.png | Bin 0 -> 1099 bytes .../code/image/personnage/Perso3.png | Bin 0 -> 1099 bytes code/src/launcher/Main.java | 15 ++++---- code/src/model/Album.java | 6 +++- 6 files changed, 45 insertions(+), 32 deletions(-) create mode 100644 code/out/production/code/image/personnage/Perso2.png create mode 100644 code/out/production/code/image/personnage/Perso3.png diff --git a/code/out/production/code/fxml/ConfigurationMenu.fxml b/code/out/production/code/fxml/ConfigurationMenu.fxml index c1f5b6f..4a61b55 100644 --- a/code/out/production/code/fxml/ConfigurationMenu.fxml +++ b/code/out/production/code/fxml/ConfigurationMenu.fxml @@ -1,22 +1,18 @@ - - - - - - - - - - - + + + + + + + + + + diff --git a/code/out/production/code/fxml/GameConfigurationMenu.fxml b/code/out/production/code/fxml/GameConfigurationMenu.fxml index c821e00..6c8b7f7 100644 --- a/code/out/production/code/fxml/GameConfigurationMenu.fxml +++ b/code/out/production/code/fxml/GameConfigurationMenu.fxml @@ -13,6 +13,8 @@ + + - - - + + + + + + + + + + + + + + + @@ -69,7 +79,7 @@ - @@ -78,9 +88,9 @@ - - - + + + diff --git a/code/out/production/code/image/personnage/Perso2.png b/code/out/production/code/image/personnage/Perso2.png new file mode 100644 index 0000000000000000000000000000000000000000..bd7f8e7d2cf9fe7ed643770f5dd9f00bfede5b6b GIT binary patch literal 1099 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)pT}UnMXwSj}Ky5HFasE6@fgu`a+T#1%;MJ2E@X2HL_X zEiJV<-BQNi)OA{Q^YM9Z)2j9K^lY1Y)q|q+^z||~?o%>yS>-RB@4|k5W)K4-8G z+8STJa-5f!*TMgR2GDGQk|4ieuq{Z0oTmM4AeS-8+ucQBbGB^*ki%Kv5n0T@z;^_M z8K-LVNdpDhOFVsD*`IPtbLp6W>+8w{Y05A13t>FJsC*U!15=Eri(`n#@v~F%%V!yg zv>z?ru;qhZWQ^gb_(zt=CAu?u{ z_lI3yc87Vr-X`3kbaHy=CZ)Md8M1*5>8u?|qTZihdLF;PxLsg!g9nqTx?+&GtmnJa zmHRz8JOaM|XlBido!pSH-Lyn9>_EG_fjsZt|2-4aKXOc|*cnoh&+=$%*TnL!G>ILp z5&F}Ay?iN{!`Qpx7i$;WY3;6`)svX#FSzlbIN_g;zST zb|pobmbykRgZZkzV<$d8>iOYQ$U++#zMKbn+qF+Dcxuh%^7_qzCQ~l4RepA1uh;1K z21mBB=7)sd{UP0@B*dpX|6!M&SIFLwMth0bGwWwA*mTG{^rvi1T1kFWm!GV*(Fw=( z8-Mn0wSD7Xvh~B%Y3r?iJmlC|SH1e=%AfOO`qzubi|2bEKJS_QW7j(Oc(=o+B>wTd zpJb9di%q!hj^x7|8|w^Y)X%0(ez)=Fd+9kfd*9}?8~>Yj;n6hte)Y-k|1;Gy7(dMx zb=x~H0GQ}hOI#yLQW8s2t&)pUffR$0fsvuEp`oskd5EEbm5GU!vAMQ^ft7*5`-it` eQ8eV{r(~v8;?^*4Ptrl41_n=8KbLh*2~7a3m!lT| literal 0 HcmV?d00001 diff --git a/code/out/production/code/image/personnage/Perso3.png b/code/out/production/code/image/personnage/Perso3.png new file mode 100644 index 0000000000000000000000000000000000000000..04af49aec025d5f94c3ccc78d9a2e3c35430ba2f GIT binary patch literal 1099 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)pT}UnMXwSj}Ky5HFasE6@fgu{yvf#1%;MJ2E@X2HL_X zEiJV<-O_bhwT!>1+qCNDD!sllOF)%Vd*;4T7 zD!0Ghde;m6O%i*S9m*54Jbv=jRs^63XzfND6dnu1Zx=l-<5#v6i}GKtRCdE5|); zjd^)_!@lp~1{y6;666;Qq)~vJru}W80ArH3yNf(4ufSd)hqJ&VvY3H^?+6GpPSxg< z1`4v5c>21sKjoI@(&v;pbc7M4DZj`sgz@~M@>vWFO!1yBjv*e$uTH*MHQPX-^`Pfm zv#qx$rZNj%)=Bsv6`i@_@NfIbbd^0OZdv)&e*h-Kb}ahubU?`I!|EU6zn2Ir z8VJ_kowH3WU4>^ub&=*nuFoEEw_{`D9&D1>CU@OH(eBq@7LJ#1F29^#=O4QK@yv5+ zm%R^6XT0YBf8}TO=cgvw9b((T6CQXdsorUQ-GdO9NoUeJS<{tXb|%=*VN4XxV7<3* zy_)9JjoG(5Us$|gd$E$U3-+_iu`u>65e*VhWXOrEN!C?RI4yERcOB!& zvXj?C(?Zt>Lg0|#1|Hu(r&WZ!X{SHXDhDjpS4Ck7=(%jp$w z`|oaK5?ZiQlCADRvy#Fmray;cCZDYH`S7EK@5M*=j}6hw^bFJ|PZO(fn7XX;{Zl(; zuE5%b%ipz7(mQ3jQfEW3NGs!~@UKaM(~nNt616_>uY--kvKjfW zssh7Va<<4F@?OI zhsvuaNZ;EuP5alZKP{D}Uw$qr<~DF-)cVYLY(_Y{#-Gg8-QRenPWsk0o5Z$SYq!Pi znXKGobVmBp)1Ob;?mSq(wf>S|JoD!=ix0UOC+_aqf7xhHH&fF7oziu3X1>Xt+kOZ! z3Gj>UIKC~HyKYKqp?uGSO?mtKHr#z1b!Y19(&(OMhL^W9OysPalDghM?r*!VW}j7k z{g6{NFx{z^xJHzuB$lLFB^RXvDF!10BST$7LtP{D5JLki6EiDQb8Q0yD+2@FYUbl8 c8glbfGSez?Ylu listeMusiques; + private Thread musicThread; public Album(ArrayList listeMusiques) { this.listeMusiques = listeMusiques; @@ -36,7 +37,7 @@ public class Album { i++; }*/ - Thread musicThread = new Thread("musique") { + musicThread = new Thread("musique") { public void run(){ int i; Media media; @@ -60,6 +61,9 @@ public class Album { } + public void stop() { + musicThread.stop(); + } public void addList(Musique musique){ listeMusiques.add(musique);