commit 376969989b5dd640abf4ae035db5eebe874b8205
parent 505606ec75b22d535e1740ac605f4bcb7a8d6890
Author: rbckman <robinbackman@gmail.com>
Date: Wed, 5 Sep 2018 16:45:24 +0300
removed unused stuff
Diffstat:
| M | tarina.py | | | 59 | ----------------------------------------------------------- |
1 file changed, 0 insertions(+), 59 deletions(-)
diff --git a/tarina.py b/tarina.py
@@ -575,64 +575,6 @@ def timelapse(beeps,camera,foldername,filename,tarinafolder):
return ''
time.sleep(0.02)
-#------------Photobooth--------------------------
-
-def photobooth(beeps, camera, filmfolder, filmname, scene, shot, take, filename):
- scene, shot, take = countlast(filmname, filmfolder)
- shot = shot + 1
- pressed = ''
- buttonpressed = ''
- buttontime = time.time()
- holdbutton = ''
- seconds = 0.5
- selected = 0
- header = 'Janica 30 kamera. Paina nappia!! :)'
- menu = ''
- while True:
- settings = 'START'
- writemenu(menu,settings,selected,header)
- pressed, buttonpressed, buttontime, holdbutton, event, keydelay = getbutton(pressed, buttonpressed, buttontime, holdbutton)
- foldername = filmfolder + filmname + '/' + 'scene' + str(scene).zfill(3) + '/shot' + str(shot).zfill(3) + '/'
- filename = 'take' + str(take).zfill(3)
- #if pressed == 'up' and selected == 0:
- # seconds = seconds + 0.1
- #if pressed == 'down' and selected == 0:
- # if seconds > 0.2:
- # seconds = seconds - 0.1
- #if pressed == 'right':
- # if selected < (len(settings) - 1):
- # selected = selected + 1
- #if pressed == 'left':
- # if selected > 0:
- # selected = selected - 1
- if pressed == 'middle':
- if selected == 0:
- writemessage('SMILE!!!!')
- time.sleep(2)
- os.makedirs(foldername)
- p = 0
- for filename in camera.capture_continuous(foldername + '/img{counter:03d}.jpg'):
- p = p + 1
- camera.led = True
- i = 0
- while i < seconds:
- writemessage('Taking picture ' + str(p))
- i = i + 0.1
- time.sleep(0.1)
- middlebutton = GPIO.input(22)
- if middlebutton == False or p > 9:
- break
- if middlebutton == False or p > 9:
- shot = shot + 1
- break
- camera.led = False
- #writemessage('Compiling timelapse')
- #os.system('avconv -y -framerate 25 -i ' + timelapsefolder + '/img%03d.jpg -c:v libx264 -level 40 -crf 24 ' + thefile + '.h264')
- #return thefile
- #if selected == 2:
- # return ''
- time.sleep(0.02)
-
#------------Remove-----------------------
def remove(filmfolder, filmname, scene, shot, take, sceneshotortake):
@@ -1211,7 +1153,6 @@ def main():
#START INTERFACE
screen = startinterface()
camera = startcamera()
- time.sleep(1)
#LOAD FILM AND SCENE SETTINGS
try:
