From 3a8864ba1cb3d9b898e81f7c12c94865d102d393 Mon Sep 17 00:00:00 2001 From: Hendrik Langer Date: Wed, 22 Jul 2020 22:26:01 +0200 Subject: [PATCH] make camera global --- raspberry/roberto/__init__.py | 3 ++- raspberry/roberto/views/frontend/routes.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/raspberry/roberto/__init__.py b/raspberry/roberto/__init__.py index 88167f3..700e0ae 100644 --- a/raspberry/roberto/__init__.py +++ b/raspberry/roberto/__init__.py @@ -12,7 +12,8 @@ from flask_login import LoginManager # to the application at this point. login = LoginManager() login.login_view = "users.login" -#from roberto.camera.camera_opencv import Camera +from roberto.camera.camera_opencv import Camera +camera = Camera() ###################################### #### Application Factory Function #### diff --git a/raspberry/roberto/views/frontend/routes.py b/raspberry/roberto/views/frontend/routes.py index b019ac3..358c56d 100644 --- a/raspberry/roberto/views/frontend/routes.py +++ b/raspberry/roberto/views/frontend/routes.py @@ -22,6 +22,7 @@ def gen(camera): @frontend_blueprint.route('/video_feed') def video_feed(): """Video streaming route. Put this in the src attribute of an img tag.""" - from roberto.camera.camera_opencv import Camera - return Response(gen(Camera()), + from roberto import camera + camera.__init__() + return Response(gen(camera), mimetype='multipart/x-mixed-replace; boundary=frame')