From 459317423f2602a6ec3dfc8a2892e7e66b9c0dbb Mon Sep 17 00:00:00 2001 From: janis Date: Sun, 30 Oct 2022 20:41:08 +0100 Subject: [PATCH] fixed a player bug and added more settings --- bin/__pycache__/player.cpython-310.pyc | Bin 3343 -> 3407 bytes bin/__pycache__/servercoms.cpython-310.pyc | Bin 2105 -> 2105 bytes bin/player.py | 19 +++++++++++-------- data/settings.ini | 1 + data/songtemp.csv | 6 +++--- data/temp.csv | 2 +- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/bin/__pycache__/player.cpython-310.pyc b/bin/__pycache__/player.cpython-310.pyc index 89b42d2becfcc63e1ce2c86bde78c0e8722295f2..f1615859aefab1148cc5347d443f111065c99c3a 100644 GIT binary patch delta 757 zcmZXS&ubGw6vy{%vOluBNwzUblNi$&8%+`F4-oaB1qGoOQF;&}wZ!bQCXKsccDHB= z)E_4gVsTD-O2C8QNrHIuTrY|qgPv{v3Vm<=QK19#;my47`_2q+o|QhAQeHBt2{?AX z-fAyq-=^*Yboc~|dL)RBM{c}t5b3zl9KECXjU z(iGf_m`g>u1p1>2tK;ZYceOwt8n~An!9ZBk_!DJ$OA3m^l9e9eEifa}seZ~5Rs@<0 z=2aHMH+FWB3^1Dh#4)9JPelS{r*XuU&9onQ{l0Bg`@Povj_WklYZ%;awbz?Q&-40! zR}(n7IrB$T-E!@FLDlzM$9egJ#>b_FgX}08vPFVKpq{WAqNz|b`kp_LHd?*VW(sY} zq1*FX)+B~qVkOd+35N(3Le#JvMbuGtgfNeoNG#iO9lNQ7Zod`!Hmg%=hCkBkkmRqm zivHjK;9s;nJm9<9YFZN;pn(b*5J45q=Xy@eyyuR7VcsNzz3VU0a?c}*(tJlh2Xh>Z soP3<}WnMN)kl|;IWhn56M#-elHBm478#h=duvvq@F>2;MoA1WyU$wihsQ>@~ delta 749 zcmZXS&ubGw6vyXn_E$E$o3*tui6n-Y+6IKGpy)wrRRj@4DI!E`S+i@pX|fw;cPoWJ z1c<>^4^r9y(i+7Fw5jroTEp(Ro@SXQ-XWq=0;?trT7=}jp`1$5u z^Xv3mvkNe0eb|QV$PhjQq}jLBY0%h|c+N6-9L@fRHM%4EP_A%8Ls|}E-=S61TFZ@A zJFee~)~L?DOI0g_IR_Clh#V`(^StIo`6T37BvrYy-XAhqmm%x-ikCtvIQ_I>I=0NPt9#oJ@f@I-kbGm-Wv?={{*|kAX*v zJTuQWm1|qvwyN~W05HpkG>P(qf@2N=2#*%WrDMwy-rj7B;F5B3S5nU^Fbw4 z0s_5bk;8lR>^Zs8P;YeX&HHw9y`gu4p!aW;z=_t29X_^pJ}uUZbdG1x1%!;KAdYf0 z6zpj)2oq_;?!+!t(J04$C$OC)#hXnJV{8dgMjSy*`kq6D7ei}^S&l@aw%>9aO6>RS zICSYT_CcFnGSMY^ei$WE5Usg1QE|%;T-Qm!+k5jEsCVPgYj$nlZn^XVw}gFG%dAxA z1r4S^080?S6l5?bp9V5$AfWF(d!0F7JHRvcoOcnIyKifvET-ybp~9B*8TmN+OYE** lglYCrzX}ERQ7>Bfs1o&3xN)0$kxT3BmtM8@l_?pg{s6BctNZ`} diff --git a/bin/__pycache__/servercoms.cpython-310.pyc b/bin/__pycache__/servercoms.cpython-310.pyc index ac07f8720c91d6f3dd4a8a2e4c03ad0321f89b8c..602fbab065a68362ec8d66d15cdfe52511cf71f4 100644 GIT binary patch delta 19 Zcmdlfuv365pO=@50SMGjZsgME001np1QGxM delta 19 Zcmdlfuv365pO=@50SG=G-^iuU0RS;$1lj-q diff --git a/bin/player.py b/bin/player.py index 9c92aaa..f9cd428 100755 --- a/bin/player.py +++ b/bin/player.py @@ -83,7 +83,7 @@ class Player: self.current_playing_pos += 1 mx.music.load(self.current_playing) mx.music.play() - self.__recent_change = 1000000 + self.__recent_change = 20 self.infoupdater() elif other.value == 2: @@ -93,7 +93,7 @@ class Player: other.value = 0 elif other.value == 3: - self.__recent_change = 1000000 + self.__recent_change = 20 other.value = 0 elif other.value == 4: @@ -109,7 +109,7 @@ class Player: self.current_playing = self.playlist.pop(0) mx.music.load(self.current_playing) mx.music.play() - self.__recent_change = 10000000 + self.__recent_change = 20 self.infoupdater() else: if inst.value == 1: @@ -119,20 +119,23 @@ class Player: # Main event-checking part if mx.music.get_busy() is False and inst.value == 1 and self.__recent_change == 0: mx.music.unload() - if config["Playback"]["loopPlayback"] == "0": + print("stopped playing") + if config["Playback"]["autoplay"] == "0": pass else: + print("playing next song") if len(self.playlist) > 0: pass - else: + elif config["Playback"]["loopPlayback"] == "1": self.playlist = copy.deepcopy(self.playlist_backup) self.current_playing_pos = -1 + else: + pass self.current_playing = self.playlist.pop(0) self.current_playing_pos += 1 mx.music.load(self.current_playing) mx.music.play() - self.__recent_change = 10000000 + self.__recent_change = 20 self.infoupdater() else: - pass - time.sleep(0.2) + time.sleep(0.2) diff --git a/data/settings.ini b/data/settings.ini index c55cb05..0bc7bdf 100755 --- a/data/settings.ini +++ b/data/settings.ini @@ -13,6 +13,7 @@ launchMaximized = True [Playback] # Choose if you want the playback to loop at the end (1 for True, 0 for False) loopPlayback = 1 +autoplay = 1 [Security] # Specifies if a password should be used for exiting the fullscreen mode on the showcase screen diff --git a/data/songtemp.csv b/data/songtemp.csv index 7a5bba3..4c2cc73 100755 --- a/data/songtemp.csv +++ b/data/songtemp.csv @@ -1,3 +1,3 @@ -0 -Lupus Nocte - Hadouken (Royalty Free Music).mp3,Minecraft OST - Pigstep.mp3,The Day You Went Away.mp3,sha la la.mp3 -163.7987518310547 +1 +18-bye-have-a-great-time.mp3,Applause Wav Sound Effects.mp3,Big_Explosion_Cut_Off.mp3,Big_Explosion_Distant.mp3,Big_Explosion_Sweeping_In.mp3,Bruh Sound Effect.mp3,Bullet_hit_car.mp3,Explosion_Hiss_Bop_Bang.mp3,JUST DO IT Sound Effect.mp3,Long_Rifle_Shots.mp3,M4_Shots.mp3,Strong_Punch-Mike_Koenig-574430706.mp3,are-you-sure-about-that.mp3,bass-boost_mD5uYk1.mp3,bye_imPxcXs.mp3,byebye_v3Dt9ad.mp3,engineer_no01.mp3,hellothere_uIgLvnP.mp3,minion_laughing.mp3,nooo.swf.mp3,obi-wan-hello-there.mp3,oh_no_1.mp3,risitas.mp3,well-be-right-back.mp3 +8.150203704833984 diff --git a/data/temp.csv b/data/temp.csv index 410a3c6..85c5560 100755 --- a/data/temp.csv +++ b/data/temp.csv @@ -1 +1 @@ -/mnt/storage/SORTED/Music +/mnt/storage/SORTED/Music/Videos/Memes + Soundeffect/