tarina

commit c73c9ff365ff137bde2c421cec3e1e8a0ec610e0
parent a6278c76d9d6de7fb63c4448ce3384a0acf90e25
Author: rob <rob@tarina.org>
Date:   Mon, 30 Oct 2023 23:10:13 +0200

Merge branch 'master' of https://git.tarina.org/tarina

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

1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/tarina.py b/tarina.py
@@ -1623,7 +1623,8 @@ def main():
                     except:
                         print('not exist')
             #organize(filmfolder,'onthefloor')
-            scenes, shots, takes = countlast(filmname, filmfolder)
+            #scenes, shots, takes = countlast(filmname, filmfolder)
+            scene, shot, take = countlast(filmname, filmfolder)
             loadfilmsettings = False
             rendermenu = True
             updatethumb =  True
@@ -3565,7 +3566,7 @@ def clipsettings(filmfolder, filmname, scene, shot, plughw):
                 newdub[3] -= 0.1
         elif pressed == 'record' and selected == 1:
             dubmix.append(newdub)
-            dubrecord = filefolder + 'dub' + str(len(dubmix)).zfill(3) + '.wav'
+            dubrecord = filefolder + 'dub' + str(len(dubfiles)+1).zfill(3) + '.wav'
             break
 
         #DUB SETTINGS
@@ -3582,7 +3583,7 @@ def clipsettings(filmfolder, filmname, scene, shot, plughw):
             if len(dubfiles) == 0:
                 selected = 0
         elif pressed == 'record' and selected == 4:
-            dubrecord = filefolder + 'dub' + str(dubselected + 1).zfill(3) + '.wav'
+            dubrecord = filefolder + 'dub' + str(len(dubfiles) + 1).zfill(3) + '.wav'
             break
         elif pressed == 'retake' and selected == 4:
             dubrecord = filefolder + 'dub' + str(dubselected + 1).zfill(3) + '.wav'
@@ -3626,18 +3627,18 @@ def clipsettings(filmfolder, filmname, scene, shot, plughw):
             renderfilename = renderfilm(filmfolder, filmname, 0, scene, False)
             playdub(filmname,renderfilename, 'scene')
         time.sleep(0.05)
-        #Save dubmix before returning
-        if dubmix != dubmix_old:
-            if os.path.isdir(filefolder) == False:
-                os.makedirs(filefolder)
-            c = 1
-            for i in dubmix:
-                with open(filefolder + ".settings" + str(c).zfill(3), "w") as f:
-                    for p in i:
-                        f.write(str(round(p,1)) + '\n')
-                        print(str(round(p,1)))
-                c += 1
-            dubmix_old = dubmix
+    #Save dubmix before returning
+    if dubmix != dubmix_old:
+        if os.path.isdir(filefolder) == False:
+            os.makedirs(filefolder)
+        c = 1
+        for i in dubmix:
+            with open(filefolder + ".settings" + str(c).zfill(3), "w") as f:
+                for p in i:
+                    f.write(str(round(p,1)) + '\n')
+                    print(str(round(p,1)))
+            c += 1
+        dubmix_old = dubmix
     return dubrecord
 
 #---------------Play & DUB--------------------