tarina

commit e02067a6b6c453537f253044686fb4ab3beac979
parent d9375c7abddc3167c3c297042dbe2f9146adc2d5
Author: rbckman <robinbackman@gmail.com>
Date:   Fri, 10 Mar 2017 15:22:34 +0000

Merge branch 'master' of https://github.com/rbckman/tarina

Diffstat:
M
VERSION
 | 
4
++--
M
backup.sh
 | 
2
+-
M
tarina.py
 | 
5
++++-

3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-0.965
-Tarina 2017
+0.967
+Tarkovsky
diff --git a/backup.sh b/backup.sh
@@ -1 +1 @@
-rsync -uav /home/pi/tarina rob@tarina.org:/srv/www/tarina.org/public_html/src/
+rsync -uav ./ rob@tarina.org:/srv/www/tarina.org/public_html/src/
diff --git a/tarina.py b/tarina.py
@@ -1153,7 +1153,9 @@ def main():
 
             #SHUTDOWN
             elif pressed == 'shutdown' and recording == False:
+                writemessage('Hold down 3 seconds to shutdown')
                 shutdownbutton = time.time()
+                time.sleep(1)
                 while pressed == 'shutdown':
                     pressed, buttonpressed, buttontime, holdbutton = getbutton(pressed, buttonpressed, buttontime, holdbutton)
                     writemessage('Hold down 3 seconds to shutdown')
@@ -1233,7 +1235,8 @@ def main():
                 savesetting(camera.brightness, camera.contrast, camera.saturation, camera.shutter_speed, camera.iso, camera.awb_mode, camera.awb_gains, awb_lock, miclevel, headphoneslevel, filmfolder, filmname, scene, shot, take, thefile, beeps, flip, renderedshots)
 
             #PLAY
-            elif pressed == 'view' and menu[selected] == 'SHOT:' or pressed == 'view' and menu[selected] == 'TAKE:':
+            #elif pressed == 'view' and menu[selected] == 'SHOT:' or pressed == 'view' and menu[selected] == 'TAKE:':
+            elif pressed == 'view' and menu[selected] != 'SCENE:' or pressed == 'view' and menu[selected] == 'FILM:':
                 if recording == False:
                     takes = counttakes(filmname, filmfolder, scene, shot)
                     if takes > 0: