commit from machine

cervelas · Jan 29, 2024 · a03e379 · a03e379
1 parent 0a8832b
commit a03e379
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/machineatubes/tube.py b/machineatubes/tube.py
@@ -225,12 +225,12 @@ def play(self, window=False, verbose=False):
     def rnd_preset(self):
         n = random.choice(presets_arp)
         out.send_noteon(4, n, 127)
-        time.sleep(0.2)
+        time.sleep(0.5)
         out.send_noteoff(4, n)
 
         n = random.choice(presets_pss)
         out.send_noteon(14, n, 127)
-        time.sleep(0.2)
+        time.sleep(0.5)
         out.send_noteoff(14, n)
 
     def setbpm(self):

diff --git a/start_machine.sh b/start_machine.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-mat -v
+mat -v
diff --git a/test.py b/test.py
@@ -26,10 +26,20 @@
 out = rm.MidiOut() # we may need more than one
 out.open_port(0)
 
+out2 = rm.MidiOut() # we may need more than one
+out2.open_port(1)
 
-out.send_noteon(14, 29, 127)
+presets_pss = [ 24, 29, 31, 33, 34, 38, 41, 42 ]
+
+out.send_noteon(14, 24, 127)
+time.sleep(1)
+out.send_noteoff(14, 24)
+time.sleep(2)
+
+out2.send_noteon(14, 83, 127)
 time.sleep(1)
-out.send_noteoff(14, 29)
+out2.send_noteoff(14, 83)
+
 
 '''out.send_noteon(14, 84, 127)
 time.sleep(0.2)

diff --git a/ui/machine.html b/ui/machine.html
@@ -119,16 +119,16 @@
 
         #video video{
             position: absolute;
-            max-width: calc(100% - 100px);
-            border: 15px solid #5000FF;
-            margin-left: 30px;
-            margin-right: auto;
+            max-width: 100vw;
+            border: 0px solid #5000FF;
+            margin-left: 0px;
+            margin-right: 0px;
         }
 
         #video .rotated{
             position: absolute;
             transform-origin: 50% 50%;
-            transform: rotate(-90deg) scale(1.82);
+            transform: rotate(-90deg) scale(1.87);
             height: 100%;
             width: 100%;
         }
@@ -232,6 +232,7 @@
         #video video.full{
             max-width: 100%;
             border: 0;
+            left: 0px;
         }
 
     </style>
@@ -278,10 +279,10 @@
 
                 <div class="sleep"><img src="assets/img/logoinfos_90.png"></div>
                 <div class="loading"><img src="assets/img/loading_90.gif"></div>
-                <video id="jingle_intro" src="assets/videos/machine/intro/intro.mp4" class="full" style="display:none;"></video>
-                <video id="dedicacevideo" class="rotated" style="display:none;"></video>
-                <video id="jingle_outro" src="assets/videos/machine/jingleout.mp4" class="full" style="display:none;" ></video>
-                <video id="outrovideo" style="display:none;" ></video>
+                <video id="jingle_intro" src="assets/videos/machine/intro/intro.mp4" class="full" style="display:none;" ></video>
+                <video id="dedicacevideo" class="rotated"></video>
+                <video id="jingle_outro" src="assets/videos/machine/jingleout.mp4" class="full"  style="display:none;"  ></video>
+                <video id="outrovideo" ></video>
             </div>
         </div>
     </body>