From 166f68144dc622ead85fca2023fc907c717bb43d Mon Sep 17 00:00:00 2001 From: Hendrik Langer Date: Thu, 6 Aug 2020 13:33:21 +0200 Subject: [PATCH] fix --- raspberry/roberto/camera/camera_gstreamer_webrtc.py | 8 +++++--- raspberry/roberto/views/frontend/routes.py | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/raspberry/roberto/camera/camera_gstreamer_webrtc.py b/raspberry/roberto/camera/camera_gstreamer_webrtc.py index a44bdeb..7236c3c 100644 --- a/raspberry/roberto/camera/camera_gstreamer_webrtc.py +++ b/raspberry/roberto/camera/camera_gstreamer_webrtc.py @@ -132,14 +132,16 @@ class WebRTCCamera(Thread): while True: try: item = self._queue.get() - if item['sid'] == self.sid: - continue if item['job'] == "connect_client": + if item['sid'] == self.sid: + continue if not self.pipe: self.start_global_pipeline() self.start_client_pipeline(item['sid']) self._num_clients += 1 elif item['job'] == "disconnect_client": + if item['sid'] == self.sid: + continue self.close_client_pipeline(item['sid']) self._num_clients -= 1 if self._num_clients == 0: @@ -196,7 +198,7 @@ class WebRTCCamera(Thread): def emit_async(self, event, data): self._queue.put({'job':'emit', 'event':event, 'data':data}) - def send_battery(val, arg): + def send_battery(self, val, arg): print("sending battery value %s" % val) self.emit_async('battery', val) diff --git a/raspberry/roberto/views/frontend/routes.py b/raspberry/roberto/views/frontend/routes.py index 76cd378..08938b7 100644 --- a/raspberry/roberto/views/frontend/routes.py +++ b/raspberry/roberto/views/frontend/routes.py @@ -1,6 +1,6 @@ from . import frontend_blueprint -from flask import current_app, render_template +from flask import current_app, render_template, send_file from flask import Response ################ @@ -44,4 +44,4 @@ def manifest_json(): @frontend_blueprint.route('/favicon.ico') def favicon_ico(): - return send_file('templates/favicon.ico', mimetype='image/x-icon') + return send_file('views/frontend/templates/favicon.ico', mimetype='image/x-icon')