tarina

commit 23449fc2e777c2be514dd88d6536d00c6a70b352
parent 95d2c6bac3491fe0fda2166be5cd54880447346b
Author: rob <rob@tarina.org>
Date:   Tue, 16 May 2023 15:19:31 +0100

render mp4 if corrupted or not found or both mp4 and h264 found

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

1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tarina.py b/tarina.py
@@ -319,15 +319,16 @@ def main():
                     vumetermessage("There's absolutely nothing in this scene! hit rec!")
             #VIEW FILM
             elif pressed == 'view' and menu[selected] == 'FILM:':
+                organize(filmfolder, filmname)
                 filmfiles = viewfilm(filmfolder, filmname)
                 if len(filmfiles) > 0:
                     writemessage('Loading film...')
                     camera.stop_preview()
-                    removeimage(camera, overlay)
+                    #removeimage(camera, overlay)
                     renderfilename = renderfilm(filmfolder, filmname, comp, 0, True)
                     if renderfilename != '':
                         remove_shots = playdub(filmname,renderfilename, 'film')
-                    overlay = displayimage(camera, imagename, overlay, 3)
+                    #overlay = displayimage(camera, imagename, overlay, 3)
                     camera.start_preview()
                 else:
                     vumetermessage('wow, shoot first! there is zero, nada, zip footage to watch now... just hit rec!')
@@ -1143,8 +1144,8 @@ def main():
             organize(filmfolder,'onthefloor')
             scenes, shots, takes = browse(filmname,filmfolder,scene,shot,take)
             scene = scenes
-            shot = shots+1
-            take = takes+1
+            shot = shots
+            take = takes
             loadfilmsettings = False
             rendermenu = True
             updatethumb =  True