administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-05 02:35:22 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix rebase issue

Browse Source
This commit is contained in:
Nick Mowen 2023-04-26 07:15:00 -06:00
parent 543e7fef84
commit e02fe8bba1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frigate/app.py
View File

@ -209,7 +209,11 @@ class FrigateApp:
comms.append(WebSocketClient(self.config)) comms.append(WebSocketClient(self.config))
self.dispatcher = Dispatcher( self.dispatcher = Dispatcher(
self.config, self.onvif_controller, self.camera_metrics, self.record_metrics, comms self.config,
self.onvif_controller,
self.camera_metrics,
self.record_metrics,
comms,
) )
def start_detectors(self) -> None: def start_detectors(self) -> None:

4
frigate/comms/dispatcher.py
View File

@ -7,12 +7,8 @@ from typing import Any, Callable
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from frigate.config import FrigateConfig from frigate.config import FrigateConfig
<<<<<<< HEAD
from frigate.ptz import OnvifController, OnvifCommandEnum from frigate.ptz import OnvifController, OnvifCommandEnum
from frigate.types import CameraMetricsTypes
=======
from frigate.types import CameraMetricsTypes, RecordMetricsTypes from frigate.types import CameraMetricsTypes, RecordMetricsTypes
>>>>>>> ab49f2f7 (Add support back for setting record via MQTT and WS)
from frigate.util import restart_frigate from frigate.util import restart_frigate