fixed progressbar on remote screen going too fast
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
4
|
||||
40
|
||||
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)
|
||||
191.00733947753906
|
||||
193.99110412597656
|
||||
|
||||
|
@@ -193,6 +193,7 @@ class Main(MDScreen):
|
||||
self.quit_requests = 0
|
||||
self.__comparepos = 10000
|
||||
self.__updateui = False
|
||||
self.__recently_updated = 0
|
||||
global address
|
||||
|
||||
def key_pressed(self, keyboard, keycode, text, modifiers):
|
||||
@@ -344,12 +345,19 @@ class Main(MDScreen):
|
||||
self.__upcoming_output += f"\n{self.__upcoming2}"
|
||||
self.__length_output += 1
|
||||
self.manager.get_screen("Showcase").ids.upcoming_songs.text = self.__upcoming_output
|
||||
if self.__recently_updated < 10:
|
||||
svc.postplaybackpos(address, self.__songpos)
|
||||
self.__recently_updated += 1
|
||||
print(self.__songpos % 60)
|
||||
if self.__songpos % 60 < 5:
|
||||
svc.postplaybackpos(address, self.__songpos)
|
||||
if address != "":
|
||||
if self.__comparepos > self.__songpos or self.__updateui:
|
||||
svc.postplaybackpos(address, self.__songpos)
|
||||
svc.postcurrentsong(address, self.__current_output)
|
||||
svc.postsonglength(address, self.__songlength)
|
||||
svc.postupcomingsongs(address, self.__upcoming_output)
|
||||
self.__recently_updated = 0
|
||||
self.__updateui = False
|
||||
else:
|
||||
pass
|
||||
|
||||
@@ -44,6 +44,7 @@ app.get('/upcomingsongs', (request, response) => {
|
||||
})
|
||||
|
||||
app.get('/songmaxlength', (request, response) => {
|
||||
console.log(songmaxlength)
|
||||
response.send(songmaxlength)
|
||||
})
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ from kivy.clock import Clock
|
||||
import handlers.comHandler
|
||||
import math
|
||||
import handlers.csv_parsers
|
||||
import time
|
||||
Builder.load_file('./ui/connectionPU.kv')
|
||||
|
||||
comHandler = handlers.comHandler.Com()
|
||||
@@ -61,6 +62,8 @@ class ShowcaseScreen(MDScreen):
|
||||
self.ids.upcoming_songs.text = self.__upcoming
|
||||
self.ids.progressbars.value = float(self.songpos / float(self.songlength) * 100)
|
||||
self.isplaying = False
|
||||
self.averagedelatation = 0
|
||||
self.passcount = 0
|
||||
Clock.schedule_interval(self.updateProgressbar, 0.1)
|
||||
|
||||
def updateScreen(self, dmp):
|
||||
@@ -90,16 +93,18 @@ class ShowcaseScreen(MDScreen):
|
||||
self.__current = comHandler.getcurrentsong(address)
|
||||
self.__upcoming = comHandler.getupcomingsongs(address)
|
||||
self.songlength = comHandler.getsonglength(address)
|
||||
print(self.songlength)
|
||||
self.ids.progressbars.value = float(self.songpos / float(self.songlength) * 100)
|
||||
self.ids.current_song.text = self.__current
|
||||
self.ids.upcoming_songs.text = self.__upcoming
|
||||
|
||||
def updateProgressbar(self, dmp):
|
||||
if self.isplaying:
|
||||
self.__songdisplay = float(self.songpos / float(self.songlength) * 100) - 1
|
||||
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
|
||||
screen_manager = ScreenManager()
|
||||
|
||||
Reference in New Issue
Block a user