tarina

commit 0635af4badee039a9fe76f4997745a1f8c620f8b
parent b2b39d4901fb6b214245424db4956f0a7af268ab
Author: rob <rob@tarina.org>
Date:   Wed, 30 Aug 2023 14:39:30 +0100

aight, sync is working with sound now

Diffstat:
M
tarina.py
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tarina.py b/tarina.py
@@ -883,7 +883,7 @@ def main():
                         if c not in camerasoff:
                             print(c)
                             if a == camselected:
-                                if camselected == 0:
+                                if a == 0:
                                     pressed='record_now'
                                     pressagain='insert_shot'
                                 else:
@@ -891,14 +891,14 @@ def main():
                                     time.sleep(sleep)
                                     sendtocamera(c,port,'PLACEHOLDER')
                             elif a == newselected:
-                                if newselected == 0:
+                                if a == 0:
                                     pressed='record_now'
                                 else:
                                     sendtocamera(c,port,'REC')
                                 camera_recording=newselected
                             else:
                                 if a == 0:
-                                    pressed='insert_shot'
+                                    pressagain='insert_shot'
                                 else:
                                     sendtocamera(c,port,'PLACEHOLDER')
                                 #time.sleep(2)
@@ -2787,7 +2787,7 @@ def rendervideo(filmfiles, filename, renderinfo):
     for f in filmfiles[:]:
         videosize = videosize + countsize(f + '.mp4')
         videomerge.append('-cat')
-        videomerge.append(f + '.mp4')
+        videomerge.append(f + '.mp4#video')
     videomerge.append('-new')
     videomerge.append(filename + '.mp4')
     #videomerge.append(filename + '.h264')