From ac673bb979ac99b8f96edb00419ff5e153021873 Mon Sep 17 00:00:00 2001 From: janis Date: Mon, 31 Oct 2022 18:00:08 +0100 Subject: [PATCH] fixed glitching progress bar when paused --- bin/__pycache__/info_handler.cpython-310.pyc | Bin 1283 -> 1283 bytes bin/__pycache__/player.cpython-310.pyc | Bin 3436 -> 3341 bytes data/songtemp.csv | 4 ++-- data/temp.csv | 2 +- .../__pycache__/comHandler.cpython-310.pyc | Bin 1897 -> 1897 bytes showcaseScreen/musicplayer_showcase_screen.py | 13 ++++++++++--- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/bin/__pycache__/info_handler.cpython-310.pyc b/bin/__pycache__/info_handler.cpython-310.pyc index 57e126441eebcb06376408dd996b2062dfe42686..b29881f0b6c8dcb3aeb53fe0e1f68394c5786044 100644 GIT binary patch delta 20 acmZqXYUbk3=jG*M0D?dF;x=;sU;zLyy#=WN delta 20 acmZqXYUbk3=jG*M0D@h*5gWOGumAums|2tB diff --git a/bin/__pycache__/player.cpython-310.pyc b/bin/__pycache__/player.cpython-310.pyc index c5d41336eb14751447dbc5a67bda34d2f7fd75b2..b13a419b52f829302ae10ce69150cf4418acb53f 100644 GIT binary patch delta 770 zcmY*X&ubGw6yCSVZZ@0E=4YEG)mm+BNvVyu_SA~SQ^8a#6t|SH$)+)B+$^(`LQBwt zcoIPzFM8Vi2~vdW#fum5u8@OA1@S-d;(J?KabUjvzW2U)^JZp$m!6l*UNWgmI9~p# zHGbvZnos4&Cn&iTz)*5vUuK#kZAn}XB91(SAnHVhFpz4>KhCX zIUSWAB!&`5+z67SLYMiUD}^c*y6#In9c0KJEX%hR1)kjGed2v~~LSXh+UI5BFp z9KC(-D792^Y;IS0^P#uY@DCW^k;(<}Eb>#GLTbpzN6{)IiCfB6ukSi+T6|Sj5?PF} z96??bRSU)iS8qT?yi@PO2cgBLVCQ%~_62sT1L&x9KQDk)v8k97IpsXki3VEOSi#YY zl9Rw`gt?S^i__icPXOIfTsh&6@l#h4U1sQ76ua?VWg;j#De*C0fVB7)U)Zp;&8~e| zw;TJGX7_o|Lp6fymeK9?yt5RW!_Hf8UeoxzRxYutbdqZX3IUy$T^61`w^1ZINpOMS zA_4sfEKe{^aD`w7VWcqIZ8fb}-}UUi-(<5Gw6s=}*Xn)$Q2fxh)HMwGkHlKSp3Z^{ zX<3FWn4p0yoA@Dl~&?b_W#zwNV(cxBAOig=G$5Z{f`3_asWTlWvPS(`W6JV|4{=kB#z Nn_*G5EGCn8{sOEQzDfW9 delta 816 zcmY*Xzi-n(6!tl>9O%Gw=sM5fcL|Ffg!XK}d*+oe|!1p@@_G>3#2gcYg1?+qZsLSwEA}C0N%! z-)S~WFSC#3{yU&tqT~@F5+{*7kf^*ZGm}bni6^2YO$l^fk$$Zf`3o?8oc>^+Cw>gML=sm<+q?%WIJn&B=ZFzak}s06I#@u3>* zxwg2U_^Q<)ugNAkxShO7G84cWO5N{xlue4)%7RgZ3@ag&#ZRR{Dq>w-A{T^E*U1O* zT^%RQ110s5^f!8>tx~crKP7AfnoiNgVayZlWTeH7SEwF)U8TmTL{0cIv8L#)@Cwbw zHFOnJusaDS)x0u4ROdjQkJT4BxC^Sxq4zWix04l%=@n%(vS>lPcyhxudpfP?B zI5hSJ{1Knhm8;zXx`b|d&I4Wxea~%}JH8*RLVC+?ZnM)culxKNuJ?-tVG>~qVH#klFxzvTMylflb|-Y$DM&Un*WsI6op6s8 zfQl!2U0s48d?>!@wyu#8A`?x{6LH-bC2xddTrvK&vnXB}=SfL?F($}__+^yUbFi0< y3Cpy=gG=T#xhxuhRna%CDZI>~wjAzmuoidN8Kma2@7-;=t2Tp<*n)U#uKfl&|IPvc diff --git a/data/songtemp.csv b/data/songtemp.csv index 5de141d..ed6c41e 100755 --- a/data/songtemp.csv +++ b/data/songtemp.csv @@ -1,3 +1,3 @@ -39 +2 Tennessee Waltz - New 101 Strings Orchestra | Slow Walz (Langsam),Morning has broken - Cat Stevens | Walzer (Mittel),Magia - Alvaro Soler | Flashmob (Mittel),Say So - Doja Cat | Discofox (Langsam),Save Your Tears (Remix) - The Weeknd & Ariana Grande | Discofox (Langsam),Shivers - Ed Sheeran | Jive/ Rocknroll (Mittel),I feel good - Ray Charles | Jive/Rocknroll (Mittel),Muevelo - Rey Ruiz | Cha cha cha (Mittel),Suelta la cintura - Ruben leon | Cha cha cha (Mittel),Como Volver a Ser Feliz - Luis Enrique | Salsa (Mittel),Mas que nada - black eyed peas | Salsa/Discofox (Mittel),Moon River - Henry Mancini | Slow Walz (Langsam),Dancing Queen - ABBA | Discofox (Langsam),Don't Call Me Up - Mabel | Discofox (Mittel),Magia - Alvaro Soler | Flashmob (Mittel),Lets have a Party - Wanda Jackson | Jive (mittel),Crazy Little Thing Called Love - Queen | Jive / Rocknroll (Schnell),El Diablo Anda Suelto - Rey Ruiz | Cha cha cha (Mittel),Lets get loud - Jennifer Lopez | Cha cha cha (Schnell),Enamorame - Somos del Barrio | Salsa (Mittel),Something Stupid (feat. Reese Witherspoon) - Michael Bublé | Rumba/cha cha cha (Langsam),When a man loves a woman - Percy Sledge | (Langsam),Scharlachrot - Patent Ochsner | Walzer (Langsam),Ily (i love you baby) [feat. Emilee] - Surf Mesa | Discofox (Mittel),Like a sex machine - James Brown | Discofox (Mittel),Uptown Funk (feat. Bruno Mars) - Discofox | Discofox (Schnell),Tutti Frutti - Little Richard | Jive / Rocknroll (Mittel),Jailhouse Rock - Elvis Presley | Jive / Rocknroll (Schnell),Are you lonesome - Elvis Presley | Slow Walz (Langsam),Ay Mujer - Rey Ruiz | Cha cha cha (Mittel),Rico Vacilon - Pedro Garcia & His Del Prado Orchestra | Cha cha cha (Mittel),Jeepers creepers - Benny Goodmann | Foxtrott (Mittel),An der schönen blauen Donau - New 101 Strings Orchestra | Wiener Walzer (Schnell),The Last Waltz - Engelbert Humperdinck | Walzer (Mittel),Stand by me - Sam Brown | Cha cha cha (Lansam),Stayin' Alive - Bee Gees | Discofox (Mittel),Easy On Me - Adele | (Langsam),Magia - Alvaro Soler | Flashmob (Mittel),Friday (feat. Mufasa & Hypeman) [Dopamine Re-Edit] - Riton & Nightcrawlers | Party (Mittel),YMCA - Village People | Party (Mittel),Cotton eyed Joe (Hennustall zermatt mix) - Rednex | Party (Mittel),Gangnam style - PSY | Party (Mittel),Take On Me - a-ha | Jive (Schnell),Rock Around the Clock - Bill Haley & His Comets | Jive / Rocknroll (Schnell),Satisfaction - Rolling Stones | Party (Mittel),"Un, dos, tres - Ricky Martin | Party (Mittel)",Party Rock anthem - LFMBQ | Party (Mittel),I don't care - Icona Pop | Party (Mittel),Love tonight - Shouse & David Guetta | Party (Mittel),Insomnia - Faithless | Party (Mittel),Angels - Robbie Williams | Slow (Langsam),Nothing compares to you - Sinead O'Connor | Slow (Langsam) -282.6797180175781 +191.33242797851562 diff --git a/data/temp.csv b/data/temp.csv index 95bdfde..99415ff 100755 --- a/data/temp.csv +++ b/data/temp.csv @@ -1 +1 @@ -/mnt/storage/SORTED/Music/KB/ +/mnt/storage/SORTED/Music/KB diff --git a/showcaseScreen/handlers/__pycache__/comHandler.cpython-310.pyc b/showcaseScreen/handlers/__pycache__/comHandler.cpython-310.pyc index db4072c4b0fb53c33ea8e478bf3158fb1c49423b..02d09a86340657d1ff82fac38bb8de2746973fcc 100644 GIT binary patch delta 19 ZcmaFK_mYn*pO=@50SJWeZ{&(+2LLmI1fKu^ delta 19 ZcmaFK_mYn*pO=@50SNeyY~+e(2LLkT1b_el diff --git a/showcaseScreen/musicplayer_showcase_screen.py b/showcaseScreen/musicplayer_showcase_screen.py index e03b18d..7fbda0a 100644 --- a/showcaseScreen/musicplayer_showcase_screen.py +++ b/showcaseScreen/musicplayer_showcase_screen.py @@ -1,4 +1,5 @@ from audioop import add +from calendar import isleap from kivy.core.window import Window from kivy.uix.screenmanager import ScreenManager from kivymd.uix.screen import MDScreen @@ -50,6 +51,7 @@ class ShowcaseScreen(MDScreen): self.__upcoming = comHandler.getupcomingsongs(address) self.songlength = comHandler.getsonglength(address) self.songpos = comHandler.getsongpos(address) + self.isplaying = False Clock.schedule_interval(self.updateProgressbar, 0.1) def updateScreen(self, dmp): @@ -68,6 +70,10 @@ class ShowcaseScreen(MDScreen): self.__current = comHandler.getcurrentsong(address) self.__upcoming = comHandler.getupcomingsongs(address) self.songlength = comHandler.getsonglength(address) + elif self.songpos > self.lastsongpos: + self.isplaying = True + elif self.songpos == self.lastsongpos: + self.isplaying = False else: pass self.lastsongpos = self.songpos @@ -80,9 +86,10 @@ class ShowcaseScreen(MDScreen): screen_manager.current = "Login" def updateProgressbar(self, dmp): - self.__songdisplay = float(self.songpos / float(self.songlength) * 100) - self.songpos += 0.1 - self.ids.progressbars.value = self.__songdisplay + if self.isplaying: + self.__songdisplay = float(self.songpos / float(self.songlength) * 100) + self.songpos += 0.1 + self.ids.progressbars.value = self.__songdisplay class MusicPlayerShowcaseScreen(MDApp): global screen_manager