webcam tweaks

screenless/bureau/photography/photography.py

@@ -27,10 +27,11 @@ class Photography(Bureau):
         tmpimg.close()
 
         # this is a dirty hack to keep the webcam system calls from hanging
-        cmd1 = "fswebcam --jpeg 95 --no-banner --resolution 320x240 /dev/null"
-        cmd2 = "fswebcam --jpeg 95 --no-banner --resolution 1920x1080 "
-        cmd2 += "-F 2 -S 1" + tmpimg.name
-        subprocess.check_output(cmd1.split())
+        #cmd1 = "fswebcam --jpeg 95 --no-banner --resolution 320x240 /dev/null"
+        #cmd2 = "fswebcam --jpeg 95 --no-banner --resolution 1920x1080 "
+        #cmd2 += "-F 2 -S 1" + tmpimg.name
+        cmd2 = "uvccapture -x1920 -y1080 -o" + tmpimg.name
+        #subprocess.check_output(cmd1.split())
         subprocess.check_output(cmd2.split())
         return {"photo": tmpimg.name}