diff --git a/bin/__pycache__/info_handler.cpython-310.pyc b/bin/__pycache__/info_handler.cpython-310.pyc index 57e1264..b29881f 100644 Binary files a/bin/__pycache__/info_handler.cpython-310.pyc and b/bin/__pycache__/info_handler.cpython-310.pyc differ diff --git a/bin/__pycache__/player.cpython-310.pyc b/bin/__pycache__/player.cpython-310.pyc index c5d4133..b13a419 100644 Binary files a/bin/__pycache__/player.cpython-310.pyc and b/bin/__pycache__/player.cpython-310.pyc differ 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 db4072c..02d09a8 100644 Binary files a/showcaseScreen/handlers/__pycache__/comHandler.cpython-310.pyc and b/showcaseScreen/handlers/__pycache__/comHandler.cpython-310.pyc differ 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