minor updates

cervelas · Sep 19, 2023 · f4b4ec7 · f4b4ec7
1 parent c600e19
commit f4b4ec7
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 22 deletions.
diff --git a/borne/styles.css b/borne/styles.css
@@ -12,10 +12,6 @@
     font-style: normal;
 }
 
-* {
-    cursor: none;
-}
-
 body{
     padding:0 0;
     margin:0 0;

diff --git a/machineatubes/parser.py b/machineatubes/parser.py
@@ -39,7 +39,7 @@ def parseJSON2Score(payload, verbose=False):
         "prenom": payload.get("prenom"),
         "numero": payload.get("numero"),
         "id_video": payload.get("id_video"),
-        "intro_video_url": "intro_bug.mp4",
+        "intro_video_url": "assets/videos/machine/bug.mp4",
     }
 
     pprint.pprint(score.infos)

diff --git a/machineatubes/tube.py b/machineatubes/tube.py
@@ -177,6 +177,7 @@ def play(self, window=False, verbose=False):
             if self.infos.get("intro_video_url"):
                 Tube.window.evaluate_js('gointro("%s", "%s")' % (get_intro_video(), self.infos["intro_video_url"]))
 
+        self.gomachine()
         print("wait playsong")
         videoend.wait(60)
         print("playsong !")
@@ -209,6 +210,11 @@ def setbpm(self):
         time.sleep(0.2)
         out.send_noteoff(0, bpm2midi[self.bpm])
 
+    def gomachine(self):
+        out.send_noteon(14, 84, 127)
+        time.sleep(0.2)
+        out.send_noteoff(14, 84)
+
     def stop(self):
         out.send_noteon(0, 12, 127)
         time.sleep(0.2)
@@ -243,20 +249,24 @@ def get_intro_video(self, id):
             try:
                 retry = 10
                 while retry > 0:
-                    print(url, headers)
+                    print("getting d-id %s" % url)
+                    time.sleep(2)
                     response = requests.get(url, headers=headers)
 
-                    #pprint.pprint(response.json(), indent=4)
+                    pprint.pprint(response.json(), indent=4)
 
                     response = response.json()
 
                     if response.get("result_url"):
+                        print("result ok from d-id !")
+                        self.infos["intro_video_url"] = response.get("result_url")
+                        if self.playing is False:
+                            Tube.window.evaluate_js('loaded()')
                         break
-
+
+                    print("retry")
                     retry -= 1
-                    time.sleep(5)
 
-                self.infos["intro_video_url"] = response.get("result_url")
             except Exception as e:
                 print("INTRO VIDEO ERROR")
                 print(e)

diff --git a/ui/machine.html b/ui/machine.html
@@ -119,9 +119,9 @@
         #video video#dedicacevideo{
             position: absolute;
             transform-origin: 50% 50%;
-            transform: rotate(-90deg) translateY(10vw);
-            max-height: 50vw;
-            max-width: 50vh;
+            transform: rotate(-90deg) scale(1.79);
+            height: 100%;
+            width: 100%;
         }
 
         #infos{
@@ -147,15 +147,15 @@
             content: "⬝";
             position: absolute;
             left: 8%;
-            line-height: 1.1em;
+            line-height: 0.5em;
         }
 
         #infos .header::after{
             content: "⬝";
             position: absolute;
             right: 8%;
-            /*transform: translate(0, -100%);*/
-            line-height: 1.1em;
+            transform: translate(0, -100%);
+            line-height: 0.9em;
         }
 
         #infos .header span{
@@ -183,8 +183,8 @@
             font-size: 0.3em;
         }
 
-        .sleep, .loading{
-            display: flex;
+        .sleep, .loading, .gifintro{
+            display: none;
             text-align: center;
             justify-content: center;
             align-content: center;
@@ -208,11 +208,13 @@
             <div class="screen paroles" >
                 <div class="sleep"><img src="assets/img/logoinfos.jpg"></div>
                 <div class="loading"><img src="assets/img/loading.gif"></div>
+                <div class="gifintro"><img src="assets/img/intro_landscape.gif"></div>
                 <div id="paroles"></div>
             </div>
             <div class="screen vertical" id="infos" >
                     <div class="sleep"><img src="assets/img/logoinfos.jpg"></div>
                     <div class="loading"><img src="assets/img/loading.gif"></div>
+                    <div class="gifintro"><img src="assets/img/intro_portrait.gif"></div>
                     <!-- <div id="infologo"><img src="assets/img/logoinfos.jpg"></div> -->
                     <div id="infonum">Chanson #57</div>
                     <div class="header"><span>>Titre</span></div>
@@ -231,6 +233,7 @@
             <div class="screen" id="titre">
                     <div class="sleep"><img src="assets/img/logoinfos.jpg"></div>
                     <div class="loading"><img src="assets/img/loading.gif"></div>
+                    <div class="gifintro"><img src="assets/img/intro_landscape.gif"></div>
                     <div class="headertitre"><img src="assets/img/logotitre.jpg"><div id="numtube">CHANSON #47</div></div>
                     <div>
                         <div id="grostitre">"UNE DANSE MYSTÉRIEUSE"</div>
@@ -241,9 +244,10 @@
             <div class="screen" id="video">
                 <div class="sleep"><img src="assets/img/logoinfos.jpg"></div>
                 <div class="loading"><img src="assets/img/loading.gif"></div>
+                <div class="gifintro"><img src="assets/img/intro_portrait.gif"></div> 
                 <video id="dedicacevideo" style="display: none;"></video>
-                <video id="introvideo" style="display:none;" src="assets/videos/machine/intro/intro.mp4"></video>
-                <video id="outrovideo" style="display:none;" src="assets/videos/machine/outro/outro.mp4"></video>
+                <video id="introvideo" style="display: none;"></video>
+                <video id="outrovideo" style="display:none;"></video>
             </div>
         </div>
     </body> 
@@ -282,8 +286,6 @@
             });
         }
 
-        loaded();
-
         var gointro = function(intro_url, dedi_url){
             loaded()
             wakeup()
@@ -295,10 +297,20 @@
             dedi_video.load();
             dedi_video.currentTime = 0;
             intro_video.addEventListener("ended", function(v){
+                const elems = document.querySelectorAll('.gifintro');
+                elems.forEach(function(e){
+                    e.style.display = "flex";
+                });
                 intro_video.style.display = "none";
                 dedi_video.play();
                 dedi_video.style.display = "block";
+
                 dedi_video.addEventListener("ended", function(v){
+
+                    const elems = document.querySelectorAll('.gifintro');
+                    elems.forEach(function(e){
+                        e.style.display = "none";
+                    });
                     dedi_video.style.display = "none";
                     window.pywebview.api.videoend();
                 });
@@ -374,5 +386,7 @@
             console.log("playing " + source);
         };
 
+        sleep();
+
     </script>
 </html>