refactor: streamline media operations and enhance PTZ XML serialization

- Refactored media operations to consistently use the `getMediaEndpoint` method for endpoint retrieval, improving code clarity and reducing redundancy.
- Simplified the `ContinuousMove`, `AbsoluteMove`, and `RelativeMove` methods by introducing shared XML serialization types for PTZ commands, enhancing maintainability.
- Updated the `generateUUID` function to improve UUID generation efficiency by reducing redundant calls to `time.Now()`.
- Replaced manual struct definitions with dedicated XML types for better readability and organization in PTZ operations.

client.go

@@ -506,15 +506,10 @@ func extractParam(authHeader, param string) string {
 }
 
 func md5Hash(s string) string {
-	return fmt.Sprintf("%x", md5sum(s))
-}
-
-func md5sum(s string) interface{} {
-	// Use crypto/md5 - import it if not already present
 	h := md5.New() //nolint:gosec // MD5 required for ONVIF digest auth
 	h.Write([]byte(s))
 
-	return h.Sum(nil)
+	return hex.EncodeToString(h.Sum(nil))
 }
 
 // generateNonce generates a cryptographically secure random nonce for digest authentication.

discovery/discovery.go

@@ -227,12 +227,16 @@ func deviceMapToSlice(m map[string]*Device) []*Device {
 
 // generateUUID generates a simple UUID (not cryptographically secure).
 func generateUUID() string {
+	now := time.Now()
+	nanos := now.UnixNano()
+	secs := now.Unix()
+
 	return fmt.Sprintf("%d-%d-%d-%d-%d",
-		time.Now().UnixNano(),
+		nanos,
-		time.Now().Unix(),
+		secs,
-		time.Now().UnixNano()%uuidMod1000,
+		nanos%uuidMod1000,
-		time.Now().Unix()%uuidMod1000,
+		secs%uuidMod1000,
-		time.Now().UnixNano()%uuidMod10000)
+		nanos%uuidMod10000)
 }
 
 // resolveNetworkInterface resolves a network interface by name or IP address.

event.go

@@ -5,6 +5,7 @@ import (
 	"encoding/xml"
 	"errors"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/0x524a/onvif-go/internal/soap"
@@ -751,28 +752,5 @@ func splitSpaceSeparated(s string) []string {
 		return nil
 	}
 
-	var result []string
+	return strings.Fields(s)
-
-	start := 0
-	inWord := false
-
-	for i, r := range s {
-		if r == ' ' || r == '\t' {
-			if inWord {
-				result = append(result, s[start:i])
-				inWord = false
-			}
-		} else {
-			if !inWord {
-				start = i
-				inWord = true
-			}
-		}
-	}
-
-	if inWord {
-		result = append(result, s[start:])
-	}
-
-	return result
 }

media.go

@@ -20,21 +20,11 @@ func (c *Client) getMediaEndpoint() string {
 	return c.endpoint
 }
 
-// getMediaSoapClient creates a new SOAP client for media operations.
-func (c *Client) getMediaSoapClient() *soap.Client {
-	username, password := c.GetCredentials()
-
-	return soap.NewClient(c.httpClient, username, password)
-}
-
 // GetProfiles retrieves all media profiles.
 //
 //nolint:funlen // GetProfiles has many statements due to parsing complex profile structures
 func (c *Client) GetProfiles(ctx context.Context) ([]*Profile, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetProfiles struct {
 		XMLName xml.Name `xml:"trt:GetProfiles"`
@@ -160,10 +150,7 @@ func (c *Client) GetProfiles(ctx context.Context) ([]*Profile, error) {
 
 // GetStreamURI retrieves the stream URI for a profile.
 func (c *Client) GetStreamURI(ctx context.Context, profileToken string) (*MediaURI, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetStreamURI struct {
 		XMLName     xml.Name `xml:"trt:GetStreamUri"`
@@ -214,10 +201,7 @@ func (c *Client) GetStreamURI(ctx context.Context, profileToken string) (*MediaU
 
 // GetSnapshotURI retrieves the snapshot URI for a profile.
 func (c *Client) GetSnapshotURI(ctx context.Context, profileToken string) (*MediaURI, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetSnapshotURI struct {
 		XMLName      xml.Name `xml:"trt:GetSnapshotUri"`
@@ -261,10 +245,7 @@ func (c *Client) GetVideoEncoderConfiguration(
 	ctx context.Context,
 	configurationToken string,
 ) (*VideoEncoderConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetVideoEncoderConfiguration struct {
 		XMLName            xml.Name `xml:"trt:GetVideoEncoderConfiguration"`
@@ -334,10 +315,7 @@ func (c *Client) GetVideoEncoderConfiguration(
 
 // GetVideoSources retrieves all video sources.
 func (c *Client) GetVideoSources(ctx context.Context) ([]*VideoSource, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetVideoSources struct {
 		XMLName xml.Name `xml:"trt:GetVideoSources"`
@@ -386,10 +364,7 @@ func (c *Client) GetVideoSources(ctx context.Context) ([]*VideoSource, error) {
 
 // GetAudioSources retrieves all audio sources.
 func (c *Client) GetAudioSources(ctx context.Context) ([]*AudioSource, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetAudioSources struct {
 		XMLName xml.Name `xml:"trt:GetAudioSources"`
@@ -430,10 +405,7 @@ func (c *Client) GetAudioSources(ctx context.Context) ([]*AudioSource, error) {
 
 // GetAudioOutputs retrieves all audio outputs.
 func (c *Client) GetAudioOutputs(ctx context.Context) ([]*AudioOutput, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetAudioOutputs struct {
 		XMLName xml.Name `xml:"trt:GetAudioOutputs"`
@@ -472,10 +444,7 @@ func (c *Client) GetAudioOutputs(ctx context.Context) ([]*AudioOutput, error) {
 
 // CreateProfile creates a new media profile.
 func (c *Client) CreateProfile(ctx context.Context, name, token string) (*Profile, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type CreateProfile struct {
 		XMLName xml.Name `xml:"trt:CreateProfile"`
@@ -517,10 +486,7 @@ func (c *Client) CreateProfile(ctx context.Context, name, token string) (*Profil
 
 // DeleteProfile deletes a media profile.
 func (c *Client) DeleteProfile(ctx context.Context, profileToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type DeleteProfile struct {
 		XMLName      xml.Name `xml:"trt:DeleteProfile"`
@@ -549,10 +515,7 @@ func (c *Client) SetVideoEncoderConfiguration(
 	config *VideoEncoderConfiguration,
 	forcePersistence bool,
 ) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type SetVideoEncoderConfiguration struct {
 		XMLName       xml.Name `xml:"trt:SetVideoEncoderConfiguration"`
@@ -626,10 +589,7 @@ func (c *Client) SetVideoEncoderConfiguration(
 
 // GetMediaServiceCapabilities retrieves media service capabilities.
 func (c *Client) GetMediaServiceCapabilities(ctx context.Context) (*MediaServiceCapabilities, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetServiceCapabilities struct {
 		XMLName xml.Name `xml:"trt:GetServiceCapabilities"`
@@ -697,10 +657,7 @@ func (c *Client) GetMediaServiceCapabilities(ctx context.Context) (*MediaService
 func (c *Client) GetVideoEncoderConfigurationOptions(
 	ctx context.Context, configurationToken string,
 ) (*VideoEncoderConfigurationOptions, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetVideoEncoderConfigurationOptions struct {
 		XMLName            xml.Name `xml:"trt:GetVideoEncoderConfigurationOptions"`
@@ -839,10 +796,7 @@ func (c *Client) GetAudioEncoderConfiguration(
 	ctx context.Context,
 	configurationToken string,
 ) (*AudioEncoderConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetAudioEncoderConfiguration struct {
 		XMLName            xml.Name `xml:"trt:GetAudioEncoderConfiguration"`
@@ -920,10 +874,7 @@ func (c *Client) SetAudioEncoderConfiguration(
 	config *AudioEncoderConfiguration,
 	forcePersistence bool,
 ) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type SetAudioEncoderConfiguration struct {
 		XMLName       xml.Name `xml:"trt:SetAudioEncoderConfiguration"`
@@ -1011,10 +962,7 @@ func (c *Client) GetMetadataConfiguration(
 	ctx context.Context,
 	configurationToken string,
 ) (*MetadataConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetMetadataConfiguration struct {
 		XMLName            xml.Name `xml:"trt:GetMetadataConfiguration"`
@@ -1104,10 +1052,7 @@ func (c *Client) SetMetadataConfiguration(
 	config *MetadataConfiguration,
 	forcePersistence bool,
 ) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type SetMetadataConfiguration struct {
 		XMLName       xml.Name `xml:"trt:SetMetadataConfiguration"`
@@ -1203,10 +1148,7 @@ func (c *Client) SetMetadataConfiguration(
 
 // GetVideoSourceModes retrieves available video source modes.
 func (c *Client) GetVideoSourceModes(ctx context.Context, videoSourceToken string) ([]*VideoSourceMode, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetVideoSourceModes struct {
 		XMLName          xml.Name `xml:"trt:GetVideoSourceModes"`
@@ -1257,10 +1199,7 @@ func (c *Client) GetVideoSourceModes(ctx context.Context, videoSourceToken strin
 
 // SetVideoSourceMode sets the video source mode.
 func (c *Client) SetVideoSourceMode(ctx context.Context, videoSourceToken, modeToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type SetVideoSourceMode struct {
 		XMLName          xml.Name `xml:"trt:SetVideoSourceMode"`
@@ -1287,10 +1226,7 @@ func (c *Client) SetVideoSourceMode(ctx context.Context, videoSourceToken, modeT
 
 // SetSynchronizationPoint sets a synchronization point for the stream.
 func (c *Client) SetSynchronizationPoint(ctx context.Context, profileToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type SetSynchronizationPoint struct {
 		XMLName      xml.Name `xml:"trt:SetSynchronizationPoint"`
@@ -1315,10 +1251,7 @@ func (c *Client) SetSynchronizationPoint(ctx context.Context, profileToken strin
 
 // GetOSDs retrieves all OSD configurations.
 func (c *Client) GetOSDs(ctx context.Context, configurationToken string) ([]*OSDConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetOSDs struct {
 		XMLName            xml.Name `xml:"trt:GetOSDs"`
@@ -1361,10 +1294,7 @@ func (c *Client) GetOSDs(ctx context.Context, configurationToken string) ([]*OSD
 
 // GetOSD retrieves a specific OSD configuration.
 func (c *Client) GetOSD(ctx context.Context, osdToken string) (*OSDConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetOSD struct {
 		XMLName  xml.Name `xml:"trt:GetOSD"`
@@ -1400,10 +1330,7 @@ func (c *Client) GetOSD(ctx context.Context, osdToken string) (*OSDConfiguration
 
 // SetOSD sets OSD configuration.
 func (c *Client) SetOSD(ctx context.Context, osd *OSDConfiguration) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type SetOSD struct {
 		XMLName xml.Name `xml:"trt:SetOSD"`
@@ -1436,10 +1363,7 @@ func (c *Client) CreateOSD(
 	videoSourceConfigurationToken string,
 	osd *OSDConfiguration,
 ) (*OSDConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type CreateOSD struct {
 		XMLName                       xml.Name `xml:"trt:CreateOSD"`
@@ -1483,10 +1407,7 @@ func (c *Client) CreateOSD(
 
 // DeleteOSD deletes an OSD configuration.
 func (c *Client) DeleteOSD(ctx context.Context, osdToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type DeleteOSD struct {
 		XMLName  xml.Name `xml:"trt:DeleteOSD"`
@@ -1511,10 +1432,7 @@ func (c *Client) DeleteOSD(ctx context.Context, osdToken string) error {
 
 // StartMulticastStreaming starts multicast streaming.
 func (c *Client) StartMulticastStreaming(ctx context.Context, profileToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type StartMulticastStreaming struct {
 		XMLName      xml.Name `xml:"trt:StartMulticastStreaming"`
@@ -1539,10 +1457,7 @@ func (c *Client) StartMulticastStreaming(ctx context.Context, profileToken strin
 
 // StopMulticastStreaming stops multicast streaming.
 func (c *Client) StopMulticastStreaming(ctx context.Context, profileToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type StopMulticastStreaming struct {
 		XMLName      xml.Name `xml:"trt:StopMulticastStreaming"`
@@ -1567,10 +1482,7 @@ func (c *Client) StopMulticastStreaming(ctx context.Context, profileToken string
 
 // GetProfile retrieves a specific media profile.
 func (c *Client) GetProfile(ctx context.Context, profileToken string) (*Profile, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetProfile struct {
 		XMLName      xml.Name `xml:"trt:GetProfile"`
@@ -1608,10 +1520,7 @@ func (c *Client) GetProfile(ctx context.Context, profileToken string) (*Profile,
 
 // SetProfile sets profile configuration.
 func (c *Client) SetProfile(ctx context.Context, profile *Profile) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type SetProfile struct {
 		XMLName xml.Name `xml:"trt:SetProfile"`
@@ -1642,10 +1551,7 @@ func (c *Client) SetProfile(ctx context.Context, profile *Profile) error {
 
 // AddVideoEncoderConfiguration adds video encoder configuration to a profile.
 func (c *Client) AddVideoEncoderConfiguration(ctx context.Context, profileToken, configurationToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type AddVideoEncoderConfiguration struct {
 		XMLName            xml.Name `xml:"trt:AddVideoEncoderConfiguration"`
@@ -1672,10 +1578,7 @@ func (c *Client) AddVideoEncoderConfiguration(ctx context.Context, profileToken,
 
 // RemoveVideoEncoderConfiguration removes video encoder configuration from a profile.
 func (c *Client) RemoveVideoEncoderConfiguration(ctx context.Context, profileToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type RemoveVideoEncoderConfiguration struct {
 		XMLName      xml.Name `xml:"trt:RemoveVideoEncoderConfiguration"`
@@ -1700,10 +1603,7 @@ func (c *Client) RemoveVideoEncoderConfiguration(ctx context.Context, profileTok
 
 // AddAudioEncoderConfiguration adds audio encoder configuration to a profile.
 func (c *Client) AddAudioEncoderConfiguration(ctx context.Context, profileToken, configurationToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type AddAudioEncoderConfiguration struct {
 		XMLName            xml.Name `xml:"trt:AddAudioEncoderConfiguration"`
@@ -1730,10 +1630,7 @@ func (c *Client) AddAudioEncoderConfiguration(ctx context.Context, profileToken,
 
 // RemoveAudioEncoderConfiguration removes audio encoder configuration from a profile.
 func (c *Client) RemoveAudioEncoderConfiguration(ctx context.Context, profileToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type RemoveAudioEncoderConfiguration struct {
 		XMLName      xml.Name `xml:"trt:RemoveAudioEncoderConfiguration"`
@@ -1758,10 +1655,7 @@ func (c *Client) RemoveAudioEncoderConfiguration(ctx context.Context, profileTok
 
 // AddAudioSourceConfiguration adds audio source configuration to a profile.
 func (c *Client) AddAudioSourceConfiguration(ctx context.Context, profileToken, configurationToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type AddAudioSourceConfiguration struct {
 		XMLName            xml.Name `xml:"trt:AddAudioSourceConfiguration"`
@@ -1788,10 +1682,7 @@ func (c *Client) AddAudioSourceConfiguration(ctx context.Context, profileToken,
 
 // RemoveAudioSourceConfiguration removes audio source configuration from a profile.
 func (c *Client) RemoveAudioSourceConfiguration(ctx context.Context, profileToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type RemoveAudioSourceConfiguration struct {
 		XMLName      xml.Name `xml:"trt:RemoveAudioSourceConfiguration"`
@@ -1816,10 +1707,7 @@ func (c *Client) RemoveAudioSourceConfiguration(ctx context.Context, profileToke
 
 // AddVideoSourceConfiguration adds video source configuration to a profile.
 func (c *Client) AddVideoSourceConfiguration(ctx context.Context, profileToken, configurationToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type AddVideoSourceConfiguration struct {
 		XMLName            xml.Name `xml:"trt:AddVideoSourceConfiguration"`
@@ -1846,10 +1734,7 @@ func (c *Client) AddVideoSourceConfiguration(ctx context.Context, profileToken,
 
 // RemoveVideoSourceConfiguration removes video source configuration from a profile.
 func (c *Client) RemoveVideoSourceConfiguration(ctx context.Context, profileToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type RemoveVideoSourceConfiguration struct {
 		XMLName      xml.Name `xml:"trt:RemoveVideoSourceConfiguration"`
@@ -1874,10 +1759,7 @@ func (c *Client) RemoveVideoSourceConfiguration(ctx context.Context, profileToke
 
 // AddPTZConfiguration adds PTZ configuration to a profile.
 func (c *Client) AddPTZConfiguration(ctx context.Context, profileToken, configurationToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type AddPTZConfiguration struct {
 		XMLName            xml.Name `xml:"trt:AddPTZConfiguration"`
@@ -1904,10 +1786,7 @@ func (c *Client) AddPTZConfiguration(ctx context.Context, profileToken, configur
 
 // RemovePTZConfiguration removes PTZ configuration from a profile.
 func (c *Client) RemovePTZConfiguration(ctx context.Context, profileToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type RemovePTZConfiguration struct {
 		XMLName      xml.Name `xml:"trt:RemovePTZConfiguration"`
@@ -1932,10 +1811,7 @@ func (c *Client) RemovePTZConfiguration(ctx context.Context, profileToken string
 
 // AddMetadataConfiguration adds metadata configuration to a profile.
 func (c *Client) AddMetadataConfiguration(ctx context.Context, profileToken, configurationToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type AddMetadataConfiguration struct {
 		XMLName            xml.Name `xml:"trt:AddMetadataConfiguration"`
@@ -1962,10 +1838,7 @@ func (c *Client) AddMetadataConfiguration(ctx context.Context, profileToken, con
 
 // RemoveMetadataConfiguration removes metadata configuration from a profile.
 func (c *Client) RemoveMetadataConfiguration(ctx context.Context, profileToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type RemoveMetadataConfiguration struct {
 		XMLName      xml.Name `xml:"trt:RemoveMetadataConfiguration"`
@@ -1993,10 +1866,7 @@ func (c *Client) GetAudioEncoderConfigurationOptions(
 	ctx context.Context,
 	configurationToken, profileToken string,
 ) (*AudioEncoderConfigurationOptions, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetAudioEncoderConfigurationOptions struct {
 		XMLName            xml.Name `xml:"trt:GetAudioEncoderConfigurationOptions"`
@@ -2045,10 +1915,7 @@ func (c *Client) GetMetadataConfigurationOptions(
 	ctx context.Context,
 	configurationToken, profileToken string,
 ) (*MetadataConfigurationOptions, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetMetadataConfigurationOptions struct {
 		XMLName            xml.Name `xml:"trt:GetMetadataConfigurationOptions"`
@@ -2124,7 +1991,9 @@ func (c *Client) GetAudioOutputConfiguration(ctx context.Context, configurationT
 	}
 
 	var resp GetAudioOutputConfigurationResponse
-	soapClient := c.getMediaSoapClient()
+
+	username, password := c.GetCredentials()
+	soapClient := soap.NewClient(c.httpClient, username, password)
 
 	if err := soapClient.Call(ctx, endpoint, "", req, &resp); err != nil {
 		return nil, fmt.Errorf("GetAudioOutputConfiguration failed: %w", err)
@@ -2140,10 +2009,7 @@ func (c *Client) GetAudioOutputConfiguration(ctx context.Context, configurationT
 
 // SetAudioOutputConfiguration sets audio output configuration.
 func (c *Client) SetAudioOutputConfiguration(ctx context.Context, config *AudioOutputConfiguration, forcePersistence bool) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type SetAudioOutputConfiguration struct {
 		XMLName       xml.Name `xml:"trt:SetAudioOutputConfiguration"`
@@ -2184,10 +2050,7 @@ func (c *Client) GetAudioOutputConfigurationOptions(
 	ctx context.Context,
 	configurationToken string,
 ) (*AudioOutputConfigurationOptions, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetAudioOutputConfigurationOptions struct {
 		XMLName            xml.Name `xml:"trt:GetAudioOutputConfigurationOptions"`
@@ -2228,10 +2091,7 @@ func (c *Client) GetAudioDecoderConfigurationOptions(
 	ctx context.Context,
 	configurationToken string,
 ) (*AudioDecoderConfigurationOptions, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetAudioDecoderConfigurationOptions struct {
 		XMLName            xml.Name `xml:"trt:GetAudioDecoderConfigurationOptions"`
@@ -2297,10 +2157,7 @@ func (c *Client) GetGuaranteedNumberOfVideoEncoderInstances(
 	ctx context.Context,
 	configurationToken string,
 ) (*GuaranteedNumberOfVideoEncoderInstances, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetGuaranteedNumberOfVideoEncoderInstances struct {
 		XMLName            xml.Name `xml:"trt:GetGuaranteedNumberOfVideoEncoderInstances"`
@@ -2340,10 +2197,7 @@ func (c *Client) GetGuaranteedNumberOfVideoEncoderInstances(
 
 // GetOSDOptions retrieves available options for OSD configuration.
 func (c *Client) GetOSDOptions(ctx context.Context, configurationToken string) (*OSDConfigurationOptions, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetOSDOptions struct {
 		XMLName            xml.Name `xml:"trt:GetOSDOptions"`
@@ -2381,10 +2235,7 @@ func (c *Client) GetOSDOptions(ctx context.Context, configurationToken string) (
 
 // GetVideoSourceConfigurations retrieves all video source configurations.
 func (c *Client) GetVideoSourceConfigurations(ctx context.Context) ([]*VideoSourceConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetVideoSourceConfigurations struct {
 		XMLName xml.Name `xml:"trt:GetVideoSourceConfigurations"`
@@ -2444,10 +2295,7 @@ func (c *Client) GetVideoSourceConfigurations(ctx context.Context) ([]*VideoSour
 
 // GetAudioSourceConfigurations retrieves all audio source configurations.
 func (c *Client) GetAudioSourceConfigurations(ctx context.Context) ([]*AudioSourceConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetAudioSourceConfigurations struct {
 		XMLName xml.Name `xml:"trt:GetAudioSourceConfigurations"`
@@ -2492,10 +2340,7 @@ func (c *Client) GetAudioSourceConfigurations(ctx context.Context) ([]*AudioSour
 
 // GetVideoEncoderConfigurations retrieves all video encoder configurations.
 func (c *Client) GetVideoEncoderConfigurations(ctx context.Context) ([]*VideoEncoderConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetVideoEncoderConfigurations struct {
 		XMLName xml.Name `xml:"trt:GetVideoEncoderConfigurations"`
@@ -2616,10 +2461,7 @@ func (c *Client) GetVideoEncoderConfigurations(ctx context.Context) ([]*VideoEnc
 
 // GetAudioEncoderConfigurations retrieves all audio encoder configurations.
 func (c *Client) GetAudioEncoderConfigurations(ctx context.Context) ([]*AudioEncoderConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetAudioEncoderConfigurations struct {
 		XMLName xml.Name `xml:"trt:GetAudioEncoderConfigurations"`
@@ -2699,10 +2541,7 @@ func (c *Client) GetVideoSourceConfiguration(
 	ctx context.Context,
 	configurationToken string,
 ) (*VideoSourceConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetVideoSourceConfiguration struct {
 		XMLName            xml.Name `xml:"trt:GetVideoSourceConfiguration"`
@@ -2785,7 +2624,9 @@ func (c *Client) GetAudioSourceConfiguration(ctx context.Context, configurationT
 	}
 
 	var resp GetAudioSourceConfigurationResponse
-	soapClient := c.getMediaSoapClient()
+
+	username, password := c.GetCredentials()
+	soapClient := soap.NewClient(c.httpClient, username, password)
 
 	if err := soapClient.Call(ctx, endpoint, "", req, &resp); err != nil {
 		return nil, fmt.Errorf("GetAudioSourceConfiguration failed: %w", err)
@@ -2804,10 +2645,7 @@ func (c *Client) GetVideoSourceConfigurationOptions(
 	ctx context.Context,
 	configurationToken, profileToken string,
 ) (*VideoSourceConfigurationOptions, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetVideoSourceConfigurationOptions struct {
 		XMLName            xml.Name `xml:"trt:GetVideoSourceConfigurationOptions"`
@@ -2867,10 +2705,7 @@ func (c *Client) GetAudioSourceConfigurationOptions(
 	ctx context.Context,
 	configurationToken, profileToken string,
 ) (*AudioSourceConfigurationOptions, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetAudioSourceConfigurationOptions struct {
 		XMLName            xml.Name `xml:"trt:GetAudioSourceConfigurationOptions"`
@@ -2916,10 +2751,7 @@ func (c *Client) SetVideoSourceConfiguration(
 	config *VideoSourceConfiguration,
 	forcePersistence bool,
 ) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type SetVideoSourceConfiguration struct {
 		XMLName       xml.Name `xml:"trt:SetVideoSourceConfiguration"`
@@ -2977,10 +2809,7 @@ func (c *Client) SetVideoSourceConfiguration(
 
 // SetAudioSourceConfiguration sets audio source configuration.
 func (c *Client) SetAudioSourceConfiguration(ctx context.Context, config *AudioSourceConfiguration, forcePersistence bool) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type SetAudioSourceConfiguration struct {
 		XMLName       xml.Name `xml:"trt:SetAudioSourceConfiguration"`
@@ -3021,10 +2850,7 @@ func (c *Client) GetCompatibleVideoEncoderConfigurations(
 	ctx context.Context,
 	profileToken string,
 ) ([]*VideoEncoderConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetCompatibleVideoEncoderConfigurations struct {
 		XMLName      xml.Name `xml:"trt:GetCompatibleVideoEncoderConfigurations"`
@@ -3102,10 +2928,7 @@ func (c *Client) GetCompatibleVideoSourceConfigurations(
 	ctx context.Context,
 	profileToken string,
 ) ([]*VideoSourceConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetCompatibleVideoSourceConfigurations struct {
 		XMLName      xml.Name `xml:"trt:GetCompatibleVideoSourceConfigurations"`
@@ -3170,10 +2993,7 @@ func (c *Client) GetCompatibleAudioEncoderConfigurations(
 	ctx context.Context,
 	profileToken string,
 ) ([]*AudioEncoderConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetCompatibleAudioEncoderConfigurations struct {
 		XMLName      xml.Name `xml:"trt:GetCompatibleAudioEncoderConfigurations"`
@@ -3224,10 +3044,7 @@ func (c *Client) GetCompatibleAudioEncoderConfigurations(
 
 // GetCompatibleAudioSourceConfigurations retrieves compatible audio source configurations for a profile.
 func (c *Client) GetCompatibleAudioSourceConfigurations(ctx context.Context, profileToken string) ([]*AudioSourceConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetCompatibleAudioSourceConfigurations struct {
 		XMLName      xml.Name `xml:"trt:GetCompatibleAudioSourceConfigurations"`
@@ -3274,10 +3091,7 @@ func (c *Client) GetCompatibleAudioSourceConfigurations(ctx context.Context, pro
 
 // GetCompatiblePTZConfigurations retrieves compatible PTZ configurations for a profile.
 func (c *Client) GetCompatiblePTZConfigurations(ctx context.Context, profileToken string) ([]*PTZConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetCompatiblePTZConfigurations struct {
 		XMLName      xml.Name `xml:"trt:GetCompatiblePTZConfigurations"`
@@ -3324,10 +3138,7 @@ func (c *Client) GetCompatiblePTZConfigurations(ctx context.Context, profileToke
 
 // GetCompatibleMetadataConfigurations retrieves compatible metadata configurations for a profile.
 func (c *Client) GetCompatibleMetadataConfigurations(ctx context.Context, profileToken string) ([]*MetadataConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetCompatibleMetadataConfigurations struct {
 		XMLName      xml.Name `xml:"trt:GetCompatibleMetadataConfigurations"`
@@ -3374,10 +3185,7 @@ func (c *Client) GetCompatibleMetadataConfigurations(ctx context.Context, profil
 
 // GetCompatibleAudioOutputConfigurations retrieves compatible audio output configurations for a profile.
 func (c *Client) GetCompatibleAudioOutputConfigurations(ctx context.Context, profileToken string) ([]*AudioOutputConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetCompatibleAudioOutputConfigurations struct {
 		XMLName      xml.Name `xml:"trt:GetCompatibleAudioOutputConfigurations"`
@@ -3424,10 +3232,7 @@ func (c *Client) GetCompatibleAudioOutputConfigurations(ctx context.Context, pro
 
 // GetCompatibleAudioDecoderConfigurations retrieves compatible audio decoder configurations for a profile.
 func (c *Client) GetCompatibleAudioDecoderConfigurations(ctx context.Context, profileToken string) ([]*AudioDecoderConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetCompatibleAudioDecoderConfigurations struct {
 		XMLName      xml.Name `xml:"trt:GetCompatibleAudioDecoderConfigurations"`
@@ -3472,10 +3277,7 @@ func (c *Client) GetCompatibleAudioDecoderConfigurations(ctx context.Context, pr
 
 // GetMetadataConfigurations retrieves all metadata configurations.
 func (c *Client) GetMetadataConfigurations(ctx context.Context) ([]*MetadataConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetMetadataConfigurations struct {
 		XMLName xml.Name `xml:"trt:GetMetadataConfigurations"`
@@ -3520,10 +3322,7 @@ func (c *Client) GetMetadataConfigurations(ctx context.Context) ([]*MetadataConf
 
 // GetAudioOutputConfigurations retrieves all audio output configurations.
 func (c *Client) GetAudioOutputConfigurations(ctx context.Context) ([]*AudioOutputConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetAudioOutputConfigurations struct {
 		XMLName xml.Name `xml:"trt:GetAudioOutputConfigurations"`
@@ -3568,10 +3367,7 @@ func (c *Client) GetAudioOutputConfigurations(ctx context.Context) ([]*AudioOutp
 
 // GetAudioDecoderConfigurations retrieves all audio decoder configurations.
 func (c *Client) GetAudioDecoderConfigurations(ctx context.Context) ([]*AudioDecoderConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetAudioDecoderConfigurations struct {
 		XMLName xml.Name `xml:"trt:GetAudioDecoderConfigurations"`
@@ -3617,10 +3413,7 @@ func (c *Client) GetAudioDecoderConfiguration(
 	ctx context.Context,
 	configurationToken string,
 ) (*AudioDecoderConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetAudioDecoderConfiguration struct {
 		XMLName            xml.Name `xml:"trt:GetAudioDecoderConfiguration"`
@@ -3660,10 +3453,7 @@ func (c *Client) GetAudioDecoderConfiguration(
 
 // SetAudioDecoderConfiguration sets audio decoder configuration.
 func (c *Client) SetAudioDecoderConfiguration(ctx context.Context, config *AudioDecoderConfiguration, forcePersistence bool) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type SetAudioDecoderConfiguration struct {
 		XMLName       xml.Name `xml:"trt:SetAudioDecoderConfiguration"`
@@ -3699,10 +3489,7 @@ func (c *Client) SetAudioDecoderConfiguration(ctx context.Context, config *Audio
 
 // GetVideoAnalyticsConfigurations retrieves all video analytics configurations.
 func (c *Client) GetVideoAnalyticsConfigurations(ctx context.Context) ([]*VideoAnalyticsConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetVideoAnalyticsConfigurations struct {
 		XMLName xml.Name `xml:"trt:GetVideoAnalyticsConfigurations"`
@@ -3748,10 +3535,7 @@ func (c *Client) GetVideoAnalyticsConfiguration(
 	ctx context.Context,
 	configurationToken string,
 ) (*VideoAnalyticsConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetVideoAnalyticsConfiguration struct {
 		XMLName            xml.Name `xml:"trt:GetVideoAnalyticsConfiguration"`
@@ -3791,10 +3575,7 @@ func (c *Client) GetVideoAnalyticsConfiguration(
 
 // GetCompatibleVideoAnalyticsConfigurations retrieves compatible video analytics configurations for a profile.
 func (c *Client) GetCompatibleVideoAnalyticsConfigurations(ctx context.Context, profileToken string) ([]*VideoAnalyticsConfiguration, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetCompatibleVideoAnalyticsConfigurations struct {
 		XMLName      xml.Name `xml:"trt:GetCompatibleVideoAnalyticsConfigurations"`
@@ -3839,10 +3620,7 @@ func (c *Client) GetCompatibleVideoAnalyticsConfigurations(ctx context.Context,
 
 // SetVideoAnalyticsConfiguration sets video analytics configuration.
 func (c *Client) SetVideoAnalyticsConfiguration(ctx context.Context, config *VideoAnalyticsConfiguration, forcePersistence bool) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type SetVideoAnalyticsConfiguration struct {
 		XMLName       xml.Name `xml:"trt:SetVideoAnalyticsConfiguration"`
@@ -3881,10 +3659,7 @@ func (c *Client) GetVideoAnalyticsConfigurationOptions(
 	ctx context.Context,
 	configurationToken, profileToken string,
 ) (*VideoAnalyticsConfigurationOptions, error) {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type GetVideoAnalyticsConfigurationOptions struct {
 		XMLName            xml.Name `xml:"trt:GetVideoAnalyticsConfigurationOptions"`
@@ -3922,10 +3697,7 @@ func (c *Client) GetVideoAnalyticsConfigurationOptions(
 
 // AddVideoAnalyticsConfiguration adds a video analytics configuration to a profile.
 func (c *Client) AddVideoAnalyticsConfiguration(ctx context.Context, profileToken, configurationToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type AddVideoAnalyticsConfiguration struct {
 		XMLName            xml.Name `xml:"trt:AddVideoAnalyticsConfiguration"`
@@ -3952,10 +3724,7 @@ func (c *Client) AddVideoAnalyticsConfiguration(ctx context.Context, profileToke
 
 // RemoveVideoAnalyticsConfiguration removes a video analytics configuration from a profile.
 func (c *Client) RemoveVideoAnalyticsConfiguration(ctx context.Context, profileToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type RemoveVideoAnalyticsConfiguration struct {
 		XMLName      xml.Name `xml:"trt:RemoveVideoAnalyticsConfiguration"`
@@ -3980,10 +3749,7 @@ func (c *Client) RemoveVideoAnalyticsConfiguration(ctx context.Context, profileT
 
 // AddAudioOutputConfiguration adds an audio output configuration to a profile.
 func (c *Client) AddAudioOutputConfiguration(ctx context.Context, profileToken, configurationToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type AddAudioOutputConfiguration struct {
 		XMLName            xml.Name `xml:"trt:AddAudioOutputConfiguration"`
@@ -4010,10 +3776,7 @@ func (c *Client) AddAudioOutputConfiguration(ctx context.Context, profileToken,
 
 // RemoveAudioOutputConfiguration removes an audio output configuration from a profile.
 func (c *Client) RemoveAudioOutputConfiguration(ctx context.Context, profileToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type RemoveAudioOutputConfiguration struct {
 		XMLName      xml.Name `xml:"trt:RemoveAudioOutputConfiguration"`
@@ -4038,10 +3801,7 @@ func (c *Client) RemoveAudioOutputConfiguration(ctx context.Context, profileToke
 
 // AddAudioDecoderConfiguration adds an audio decoder configuration to a profile.
 func (c *Client) AddAudioDecoderConfiguration(ctx context.Context, profileToken, configurationToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type AddAudioDecoderConfiguration struct {
 		XMLName            xml.Name `xml:"trt:AddAudioDecoderConfiguration"`
@@ -4068,10 +3828,7 @@ func (c *Client) AddAudioDecoderConfiguration(ctx context.Context, profileToken,
 
 // RemoveAudioDecoderConfiguration removes an audio decoder configuration from a profile.
 func (c *Client) RemoveAudioDecoderConfiguration(ctx context.Context, profileToken string) error {
-	endpoint := c.mediaEndpoint
+	endpoint := c.getMediaEndpoint()
-	if endpoint == "" {
-		endpoint = c.endpoint
-	}
 
 	type RemoveAudioDecoderConfiguration struct {
 		XMLName      xml.Name `xml:"trt:RemoveAudioDecoderConfiguration"`

ptz.go

@@ -11,6 +11,61 @@ import (
 // PTZ service namespace.
 const ptzNamespace = "http://www.onvif.org/ver20/ptz/wsdl"
 
+// ptzPanTiltXML is a shared type for PTZ pan/tilt XML serialization.
+type ptzPanTiltXML struct {
+	X     float64 `xml:"x,attr"`
+	Y     float64 `xml:"y,attr"`
+	Space string  `xml:"space,attr,omitempty"`
+}
+
+// ptzZoomXML is a shared type for PTZ zoom XML serialization.
+type ptzZoomXML struct {
+	X     float64 `xml:"x,attr"`
+	Space string  `xml:"space,attr,omitempty"`
+}
+
+// ptzVectorXML is a shared type for PTZ position/velocity XML serialization.
+type ptzVectorXML struct {
+	PanTilt *ptzPanTiltXML `xml:"PanTilt,omitempty"`
+	Zoom    *ptzZoomXML    `xml:"Zoom,omitempty"`
+}
+
+// ptzSpeedXML is a shared type for PTZ speed XML serialization.
+type ptzSpeedXML struct {
+	PanTilt *ptzPanTiltXML `xml:"PanTilt,omitempty"`
+	Zoom    *ptzZoomXML    `xml:"Zoom,omitempty"`
+}
+
+// convertToPTZVectorXML converts PTZVector to XML struct.
+func convertToPTZVectorXML(v *PTZVector) *ptzVectorXML {
+	if v == nil {
+		return nil
+	}
+	result := &ptzVectorXML{}
+	if v.PanTilt != nil {
+		result.PanTilt = &ptzPanTiltXML{X: v.PanTilt.X, Y: v.PanTilt.Y, Space: v.PanTilt.Space}
+	}
+	if v.Zoom != nil {
+		result.Zoom = &ptzZoomXML{X: v.Zoom.X, Space: v.Zoom.Space}
+	}
+	return result
+}
+
+// convertToPTZSpeedXML converts PTZSpeed to XML struct.
+func convertToPTZSpeedXML(s *PTZSpeed) *ptzSpeedXML {
+	if s == nil {
+		return nil
+	}
+	result := &ptzSpeedXML{}
+	if s.PanTilt != nil {
+		result.PanTilt = &ptzPanTiltXML{X: s.PanTilt.X, Y: s.PanTilt.Y, Space: s.PanTilt.Space}
+	}
+	if s.Zoom != nil {
+		result.Zoom = &ptzZoomXML{X: s.Zoom.X, Space: s.Zoom.Space}
+	}
+	return result
+}
+
 // ContinuousMove starts continuous PTZ movement.
 func (c *Client) ContinuousMove(ctx context.Context, profileToken string, velocity *PTZSpeed, timeout *string) error {
 	endpoint := c.ptzEndpoint
@@ -22,62 +77,17 @@ func (c *Client) ContinuousMove(ctx context.Context, profileToken string, veloci
 		XMLName      xml.Name     `xml:"tptz:ContinuousMove"`
 		Xmlns        string       `xml:"xmlns:tptz,attr"`
 		ProfileToken string       `xml:"tptz:ProfileToken"`
-		Velocity     *struct {
+		Velocity     *ptzSpeedXML `xml:"tptz:Velocity"`
-			PanTilt *struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"PanTilt,omitempty"`
-			Zoom *struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"Zoom,omitempty"`
-		} `xml:"tptz:Velocity"`
 		Timeout      *string      `xml:"tptz:Timeout,omitempty"`
 	}
 
 	req := ContinuousMove{
 		Xmlns:        ptzNamespace,
 		ProfileToken: profileToken,
+		Velocity:     convertToPTZSpeedXML(velocity),
 		Timeout:      timeout,
 	}
 
-	if velocity != nil {
-		req.Velocity = &struct {
-			PanTilt *struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"PanTilt,omitempty"`
-			Zoom *struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"Zoom,omitempty"`
-		}{}
-
-		if velocity.PanTilt != nil {
-			req.Velocity.PanTilt = &struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			}{
-				X:     velocity.PanTilt.X,
-				Y:     velocity.PanTilt.Y,
-				Space: velocity.PanTilt.Space,
-			}
-		}
-
-		if velocity.Zoom != nil {
-			req.Velocity.Zoom = &struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			}{
-				X:     velocity.Zoom.X,
-				Space: velocity.Zoom.Space,
-			}
-		}
-	}
-
 	username, password := c.GetCredentials()
 	soapClient := soap.NewClient(c.httpClient, username, password)
 
@@ -99,105 +109,15 @@ func (c *Client) AbsoluteMove(ctx context.Context, profileToken string, position
 		XMLName      xml.Name      `xml:"tptz:AbsoluteMove"`
 		Xmlns        string        `xml:"xmlns:tptz,attr"`
 		ProfileToken string        `xml:"tptz:ProfileToken"`
-		Position     *struct {
+		Position     *ptzVectorXML `xml:"tptz:Position"`
-			PanTilt *struct {
+		Speed        *ptzSpeedXML  `xml:"tptz:Speed,omitempty"`
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"PanTilt,omitempty"`
-			Zoom *struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"Zoom,omitempty"`
-		} `xml:"tptz:Position"`
-		Speed *struct {
-			PanTilt *struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"PanTilt,omitempty"`
-			Zoom *struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"Zoom,omitempty"`
-		} `xml:"tptz:Speed,omitempty"`
 	}
 
 	req := AbsoluteMove{
 		Xmlns:        ptzNamespace,
 		ProfileToken: profileToken,
-	}
+		Position:     convertToPTZVectorXML(position),
-
+		Speed:        convertToPTZSpeedXML(speed),
-	if position != nil {
-		req.Position = &struct {
-			PanTilt *struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"PanTilt,omitempty"`
-			Zoom *struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"Zoom,omitempty"`
-		}{}
-
-		if position.PanTilt != nil {
-			req.Position.PanTilt = &struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			}{
-				X:     position.PanTilt.X,
-				Y:     position.PanTilt.Y,
-				Space: position.PanTilt.Space,
-			}
-		}
-
-		if position.Zoom != nil {
-			req.Position.Zoom = &struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			}{
-				X:     position.Zoom.X,
-				Space: position.Zoom.Space,
-			}
-		}
-	}
-
-	if speed != nil {
-		req.Speed = &struct {
-			PanTilt *struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"PanTilt,omitempty"`
-			Zoom *struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"Zoom,omitempty"`
-		}{}
-
-		if speed.PanTilt != nil {
-			req.Speed.PanTilt = &struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			}{
-				X:     speed.PanTilt.X,
-				Y:     speed.PanTilt.Y,
-				Space: speed.PanTilt.Space,
-			}
-		}
-
-		if speed.Zoom != nil {
-			req.Speed.Zoom = &struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			}{
-				X:     speed.Zoom.X,
-				Space: speed.Zoom.Space,
-			}
-		}
 	}
 
 	username, password := c.GetCredentials()
@@ -221,105 +141,15 @@ func (c *Client) RelativeMove(ctx context.Context, profileToken string, translat
 		XMLName      xml.Name      `xml:"tptz:RelativeMove"`
 		Xmlns        string        `xml:"xmlns:tptz,attr"`
 		ProfileToken string        `xml:"tptz:ProfileToken"`
-		Translation  *struct {
+		Translation  *ptzVectorXML `xml:"tptz:Translation"`
-			PanTilt *struct {
+		Speed        *ptzSpeedXML  `xml:"tptz:Speed,omitempty"`
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"PanTilt,omitempty"`
-			Zoom *struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"Zoom,omitempty"`
-		} `xml:"tptz:Translation"`
-		Speed *struct {
-			PanTilt *struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"PanTilt,omitempty"`
-			Zoom *struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"Zoom,omitempty"`
-		} `xml:"tptz:Speed,omitempty"`
 	}
 
 	req := RelativeMove{
 		Xmlns:        ptzNamespace,
 		ProfileToken: profileToken,
-	}
+		Translation:  convertToPTZVectorXML(translation),
-
+		Speed:        convertToPTZSpeedXML(speed),
-	if translation != nil {
-		req.Translation = &struct {
-			PanTilt *struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"PanTilt,omitempty"`
-			Zoom *struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"Zoom,omitempty"`
-		}{}
-
-		if translation.PanTilt != nil {
-			req.Translation.PanTilt = &struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			}{
-				X:     translation.PanTilt.X,
-				Y:     translation.PanTilt.Y,
-				Space: translation.PanTilt.Space,
-			}
-		}
-
-		if translation.Zoom != nil {
-			req.Translation.Zoom = &struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			}{
-				X:     translation.Zoom.X,
-				Space: translation.Zoom.Space,
-			}
-		}
-	}
-
-	if speed != nil {
-		req.Speed = &struct {
-			PanTilt *struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"PanTilt,omitempty"`
-			Zoom *struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"Zoom,omitempty"`
-		}{}
-
-		if speed.PanTilt != nil {
-			req.Speed.PanTilt = &struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			}{
-				X:     speed.PanTilt.X,
-				Y:     speed.PanTilt.Y,
-				Space: speed.PanTilt.Space,
-			}
-		}
-
-		if speed.Zoom != nil {
-			req.Speed.Zoom = &struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			}{
-				X:     speed.Zoom.X,
-				Space: speed.Zoom.Space,
-			}
-		}
 	}
 
 	username, password := c.GetCredentials()
@@ -538,59 +368,14 @@ func (c *Client) GotoPreset(ctx context.Context, profileToken, presetToken strin
 		Xmlns        string       `xml:"xmlns:tptz,attr"`
 		ProfileToken string       `xml:"tptz:ProfileToken"`
 		PresetToken  string       `xml:"tptz:PresetToken"`
-		Speed        *struct {
+		Speed        *ptzSpeedXML `xml:"tptz:Speed,omitempty"`
-			PanTilt *struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"PanTilt,omitempty"`
-			Zoom *struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"Zoom,omitempty"`
-		} `xml:"tptz:Speed,omitempty"`
 	}
 
 	req := GotoPreset{
 		Xmlns:        ptzNamespace,
 		ProfileToken: profileToken,
 		PresetToken:  presetToken,
-	}
+		Speed:        convertToPTZSpeedXML(speed),
-
-	if speed != nil {
-		req.Speed = &struct {
-			PanTilt *struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"PanTilt,omitempty"`
-			Zoom *struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"Zoom,omitempty"`
-		}{}
-
-		if speed.PanTilt != nil {
-			req.Speed.PanTilt = &struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			}{
-				X:     speed.PanTilt.X,
-				Y:     speed.PanTilt.Y,
-				Space: speed.PanTilt.Space,
-			}
-		}
-
-		if speed.Zoom != nil {
-			req.Speed.Zoom = &struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			}{
-				X:     speed.Zoom.X,
-				Space: speed.Zoom.Space,
-			}
-		}
 	}
 
 	username, password := c.GetCredentials()
@@ -688,58 +473,13 @@ func (c *Client) GotoHomePosition(ctx context.Context, profileToken string, spee
 		XMLName      xml.Name     `xml:"tptz:GotoHomePosition"`
 		Xmlns        string       `xml:"xmlns:tptz,attr"`
 		ProfileToken string       `xml:"tptz:ProfileToken"`
-		Speed        *struct {
+		Speed        *ptzSpeedXML `xml:"tptz:Speed,omitempty"`
-			PanTilt *struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"PanTilt,omitempty"`
-			Zoom *struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"Zoom,omitempty"`
-		} `xml:"tptz:Speed,omitempty"`
 	}
 
 	req := GotoHomePosition{
 		Xmlns:        ptzNamespace,
 		ProfileToken: profileToken,
-	}
+		Speed:        convertToPTZSpeedXML(speed),
-
-	if speed != nil {
-		req.Speed = &struct {
-			PanTilt *struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"PanTilt,omitempty"`
-			Zoom *struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			} `xml:"Zoom,omitempty"`
-		}{}
-
-		if speed.PanTilt != nil {
-			req.Speed.PanTilt = &struct {
-				X     float64 `xml:"x,attr"`
-				Y     float64 `xml:"y,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			}{
-				X:     speed.PanTilt.X,
-				Y:     speed.PanTilt.Y,
-				Space: speed.PanTilt.Space,
-			}
-		}
-
-		if speed.Zoom != nil {
-			req.Speed.Zoom = &struct {
-				X     float64 `xml:"x,attr"`
-				Space string  `xml:"space,attr,omitempty"`
-			}{
-				X:     speed.Zoom.X,
-				Space: speed.Zoom.Space,
-			}
-		}
 	}
 
 	username, password := c.GetCredentials()