From add8ae2badecea3bf0564965bfaeaed168109e8a Mon Sep 17 00:00:00 2001 From: Cedric Verstraeten Date: Mon, 25 Dec 2023 21:26:55 +0100 Subject: [PATCH] Revert "disable imaging" This reverts commit 6c5db5fed63f69109273dd175b53134f29102f6a. --- functionmap.go | 4 ++-- mappings.go | 5 +++-- xsd/onvif/onvif.go | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/functionmap.go b/functionmap.go index f6d0edb..49718a2 100644 --- a/functionmap.go +++ b/functionmap.go @@ -20,8 +20,8 @@ func FunctionByServiceAndFunctionName(serviceName, functionName string) (Functio functionMap = EventFunctionMap case AnalyticsWebService: functionMap = AnalyticsFunctionMap - //case ImagingWebService: - // functionMap = ImagingFunctionMap + case ImagingWebService: + functionMap = ImagingFunctionMap case RecordingWebService: functionMap = RecordingFunctionMap default: diff --git a/mappings.go b/mappings.go index 7bf4eb9..2f6726b 100644 --- a/mappings.go +++ b/mappings.go @@ -12,6 +12,7 @@ import ( "github.com/kerberos-io/onvif/analytics" "github.com/kerberos-io/onvif/device" "github.com/kerberos-io/onvif/event" + "github.com/kerberos-io/onvif/imaging" "github.com/kerberos-io/onvif/media" "github.com/kerberos-io/onvif/media2" "github.com/kerberos-io/onvif/ptz" @@ -140,7 +141,7 @@ var EventFunctionMap = map[string]Function{ Unsubscribe: &event.UnsubscribeFunction{}, } -/*var ImagingFunctionMap = map[string]Function{ +var ImagingFunctionMap = map[string]Function{ GetCurrentPreset: &imaging.GetCurrentPresetFunction{}, GetImagingSettings: &imaging.GetImagingSettingsFunction{}, GetMoveOptions: &imaging.GetMoveOptionsFunction{}, @@ -152,7 +153,7 @@ var EventFunctionMap = map[string]Function{ SetCurrentPreset: &imaging.SetCurrentPresetFunction{}, SetImagingSettings: &imaging.SetImagingSettingsFunction{}, Stop: &imaging.StopFunction{}, -}*/ +} var MediaFunctionMap = map[string]Function{ AddAudioDecoderConfiguration: &media.AddAudioDecoderConfigurationFunction{}, diff --git a/xsd/onvif/onvif.go b/xsd/onvif/onvif.go index 4c8106b..adc48dd 100644 --- a/xsd/onvif/onvif.go +++ b/xsd/onvif/onvif.go @@ -1840,8 +1840,8 @@ type RelayOutputSettings struct { } type DigitalInput struct { - Token ReferenceToken `xml:"token,attr"` - IdleState InputIdleState `xml:"IdleState,attr"` + Token ReferenceToken `xml:"token,attr"` + IdleState InputIdleState `xml:"IdleState,attr"` } // TODO:enumeration