onvif: make relative movement the ptz default

koush · Mar 19, 2023 · 7e6230d · 7e6230d
1 parent 2ce187b
commit 7e6230d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/plugins/onvif/package-lock.json b/plugins/onvif/package-lock.json
diff --git a/plugins/onvif/package.json b/plugins/onvif/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/onvif",
-   "version": "0.0.117",
+   "version": "0.0.118",
    "description": "ONVIF Camera Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",

diff --git a/plugins/onvif/src/onvif-ptz.ts b/plugins/onvif/src/onvif-ptz.ts
@@ -1,7 +1,7 @@
 import { DeviceState, MixinDeviceBase, MixinDeviceOptions, MixinProvider, PanTiltZoom, PanTiltZoomCommand, PanTiltZoomMovement, ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, Setting, Settings, SettingValue } from "@scrypted/sdk";
 import { StorageSettings } from "@scrypted/sdk/storage-settings";
 import { connectCameraAPI } from "./onvif-api";
-import {SettingsMixinDeviceBase, SettingsMixinDeviceOptions} from '../../../common/src/settings-mixin';
+import { SettingsMixinDeviceBase, SettingsMixinDeviceOptions } from '../../../common/src/settings-mixin';
 
 export class OnvifPtzMixin extends SettingsMixinDeviceBase<Settings> implements PanTiltZoom, Settings {
     storageSettings = new StorageSettings(this, {
@@ -55,9 +55,9 @@ export class OnvifPtzMixin extends SettingsMixinDeviceBase<Settings> implements
             };
         }
 
-        if (command.movement === PanTiltZoomMovement.Relative) {
+        if (command.movement === PanTiltZoomMovement.Absolute) {
             return new Promise<void>((r, f) => {
-                client.cam.relativeMove({
+                client.cam.absoluteMove({
                     x: command.pan,
                     y: command.tilt,
                     zoom: command.zoom,
@@ -69,9 +69,10 @@ export class OnvifPtzMixin extends SettingsMixinDeviceBase<Settings> implements
                 })
             })
         }
-        else if (command.movement === PanTiltZoomMovement.Absolute) {
+        else {
+            // relative movement is default.
             return new Promise<void>((r, f) => {
-                client.cam.absoluteMove({
+                client.cam.relativeMove({
                     x: command.pan,
                     y: command.tilt,
                     zoom: command.zoom,