bugfix

borne/p1.php

@@ -78,8 +78,8 @@
     "beat": '.($measure * 4).',
                     "note": '.$stopall.',
                     "duration": 4
-            }
-            ]
+            }*/
+$json .=']
             },';
-*/
+
 ?>

machineatubes/main.py

@@ -105,21 +105,14 @@ def start(self):
                 time.sleep(0.2)
                 self.win.toggle_fullscreen()
 
-    def oldplay(self):
-        if len(self.tubes) > 0 and self.tubes[0].playing is False:
-            abort.clear()
-            self.tubes[0].aplay(self.win, args.verbose)
-        if len(self.tubes) > 1:
-            self.tubes.pop(0)
-
     def __play(self):
         playing.set()
         if len(self.tubes) == 0 and self.last_tube:
             self.last_tube.play(self.win, args.verbose)
             self.last_tube.stop()
 
         while len(self.tubes) > 0 and not abort.is_set():
-            if len(self.tubes) > 0 and self.tubes[0].playing is False:
+            if len(self.tubes) > 0 and Tube.playing is False:
                 playlist = "<br> Playing %s (%s)" % (self.tubes[0].name, self.tubes[0].infos["numero"])
                 playlist = "<br> Next Song ".join([ "%s (%s)" % (t.name, t.infos["numero"]) for t in self.tubes[1:] ])
                 self.ctrlwin.evaluate_js('uplist("%s")' % playlist)

machineatubes/tube.py

@@ -90,6 +90,7 @@ def nanosleep(s):
 class Tube():
 
     window = False
+    playing = False
 
     def __init__(self, name="noname") -> None:
         self.name = name
@@ -103,7 +104,6 @@ def __init__(self, name="noname") -> None:
         self.start_time = 0
         self.time_signature = 0
         self.divisions = 16
-        self.playing = False
         self.infos = {}
         self.intro_video_url = None
 
@@ -171,7 +171,7 @@ def playintro(self):
 
     def play(self, window=False, verbose=False):
         videoend.clear()
-        self.playing = True
+        Tube.playing = True
         if Tube.window:
             Tube.window.evaluate_js('displayinfos("%s","%s","%s","%s","%s","%s")' % 
                                     (self.name, self.infos["numero"], self.infos["ambiance"], self.infos["style"], self.bpm, self.infos["prenom"]))
@@ -201,14 +201,15 @@ def play(self, window=False, verbose=False):
         videoend.clear()
         self.stop()
         self.applause()
-        time.sleep(2)
+        time.sleep(3)
         Tube.window.evaluate_js('gooutro("%s")' % get_outro_video())
         print("END")
         videoend.wait(60)
+        #attente
         time.sleep(5)
         self.stop()
 
-        self.playing = False
+        Tube.playing = False
 
     def setbpm(self):
         out.send_noteon(0, bpm2midi[self.bpm], 127)
@@ -256,7 +257,7 @@ def mix_videos(self):
     def get_intro_video(self, id):
         print("get video id " + id)
         if id and len(id) > 0:
-            if self.playing is False:
+            if Tube.playing is False:
                 Tube.window.evaluate_js('loading()')
 
             url = "https://api.d-id.com/talks/" + id
@@ -283,7 +284,7 @@ def get_intro_video(self, id):
                         if response.status_code == 200:
                             self.infos["intro_video_url"] = video_url
 
-                        if self.playing is False:
+                        if Tube.playing is False:
                             Tube.window.evaluate_js('loaded()')
                         break