tarina

commit d7ea7bf8a8c9ccd85aba539e53f72b7cf0613b7f
parent ffbcad31dcea44b4b1302fb111abfe1afcd721d1
Author: Rob <rob@tarina.org>
Date:   Wed, 21 Dec 2022 12:24:30 +0000

menu bug gone

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

1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/tarina.py b/tarina.py
@@ -1110,23 +1110,23 @@ def main():
             camerablue = str(float(camera.awb_gains[1]))[:4]
 
         #Check if menu is changed and save settings / sec
-        if buttonpressed == True or recording == True or rendermenu == True:
-            lastmenu = menu[selected]
-            settings = filmname, str(scene) + '/' + str(scenes), str(shot) + '/' + str(shots), str(take) + '/' + str(takes), rectime, camerashutter, cameraiso, camerared, camerablue, str(camera.framerate), str(quality), str(camera.brightness), str(camera.contrast), str(camera.saturation), str(flip), str(beeps), str(reclenght), str(plughw), str(channels), str(miclevel), str(headphoneslevel), str(comp), '', lens, diskleft, '', serverstate, wifistate, '', '', '', '', '', '', live
-            #Rerender menu if picamera settings change
-            if settings != oldsettings or selected != oldselected:
-                writemenu(menu,settings,selected,'',showmenu)
-                rendermenu = True
-            #save settings if menu has been updated and x seconds passed
-            if recording == False:
-                if time.time() - pausetime > savesettingsevery: 
-                    settings_to_save = [filmfolder, filmname, camera.brightness, camera.contrast, camera.saturation, camera.shutter_speed, camera.iso, camera.awb_mode, camera.awb_gains, awb_lock, miclevel, headphoneslevel, beeps, flip, comp, between, duration, showmenu_settings, quality,wifistate,serverstate,plughw,channels]
-                    #print('saving settings')
-                    savesettings(settings_to_save, filmname, filmfolder)
-                    pausetime = time.time()
-            #writemessage(pressed)
-            oldsettings = settings
-            oldselected = selected
+        #if buttonpressed == True or recording == True or rendermenu == True:
+        lastmenu = menu[selected]
+        settings = filmname, str(scene) + '/' + str(scenes), str(shot) + '/' + str(shots), str(take) + '/' + str(takes), rectime, camerashutter, cameraiso, camerared, camerablue, str(camera.framerate), str(quality), str(camera.brightness), str(camera.contrast), str(camera.saturation), str(flip), str(beeps), str(reclenght), str(plughw), str(channels), str(miclevel), str(headphoneslevel), str(comp), '', lens, diskleft, '', serverstate, wifistate, '', '', '', '', '', '', live
+        #Rerender menu if picamera settings change
+        #if settings != oldsettings or selected != oldselected:
+        writemenu(menu,settings,selected,'',showmenu)
+        #rendermenu = True
+        #save settings if menu has been updated and x seconds passed
+        if recording == False:
+            if time.time() - pausetime > savesettingsevery: 
+                settings_to_save = [filmfolder, filmname, camera.brightness, camera.contrast, camera.saturation, camera.shutter_speed, camera.iso, camera.awb_mode, camera.awb_gains, awb_lock, miclevel, headphoneslevel, beeps, flip, comp, between, duration, showmenu_settings, quality,wifistate,serverstate,plughw,channels]
+                #print('saving settings')
+                savesettings(settings_to_save, filmname, filmfolder)
+                pausetime = time.time()
+        #writemessage(pressed)
+        oldsettings = settings
+        oldselected = selected
         time.sleep(keydelay)