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

fix merge conflict

Browse Source
This commit is contained in:
Josh Hawkins 2023-07-03 09:51:11 -05:00
parent 9362775eae
commit 39fbe47fc3
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frigate/app.py
View File

@ -133,7 +133,9 @@ class FrigateApp:
"i", "i",
self.config.cameras[camera_name].motion.improve_contrast, self.config.cameras[camera_name].motion.improve_contrast,
), ),
"ptz_autotracker_enabled": mp.Value( "ptz_autotracker_enabled": mp.Value( # type: ignore[typeddict-item]
# issue https://github.com/python/typeshed/issues/8799
# from mypy 0.981 onwards
"i", "i",
self.config.cameras[camera_name].onvif.autotracking.enabled, self.config.cameras[camera_name].onvif.autotracking.enabled,
), ),
@ -166,10 +168,19 @@ class FrigateApp:
"capture_process": None, "capture_process": None,
"process": None, "process": None,
} }
self.record_metrics[camera_name] = { self.feature_metrics[camera_name] = {
"record_enabled": mp.Value( "audio_enabled": mp.Value( # type: ignore[typeddict-item]
"i", self.config.cameras[camera_name].record.enabled # issue https://github.com/python/typeshed/issues/8799
) # from mypy 0.981 onwards
"i",
self.config.cameras[camera_name].audio.enabled,
),
"record_enabled": mp.Value( # type: ignore[typeddict-item]
# issue https://github.com/python/typeshed/issues/8799
# from mypy 0.981 onwards
"i",
self.config.cameras[camera_name].record.enabled,
),
} }
def set_log_levels(self) -> None: def set_log_levels(self) -> None: