From 27d7ae0a3f50b5554d4ead0fbb09c2490d62ad07 Mon Sep 17 00:00:00 2001 From: Marlon Schumacher <schumacher@hfm-karlsruhe.de> Date: Thu, 06 Mar 2025 15:40:52 +0100 Subject: [PATCH] fix: adding leading whitespace to sox-trim string output --- sources/classes/sox-hoaencode.lisp | 39 ++------------------------------------- 1 files changed, 2 insertions(+), 37 deletions(-) diff --git a/sources/classes/sox-hoaencode.lisp b/sources/classes/sox-hoaencode.lisp index c916b79..8017c38 100644 --- a/sources/classes/sox-hoaencode.lisp +++ b/sources/classes/sox-hoaencode.lisp @@ -102,41 +102,6 @@ ) )) -; #### Utility functions #### - -#| -(defun sox-hoaencode-auto-convert-positions (positions) -"Ensures that positions are given as '((azimuth elevation) ...) (in degrees), i.e. -1) if list of list of three values, input is assumed to be '(x y z) coordinates and will be transformed to '(azimuth elevation) coordinates (in the navigational spherical coordinate system). -2) if list of list of two values, input is assumed to be '(azimuth elevation) coordinates and won't be transformed any further. -3) if 3dc, input is transformed to '(azimuth elevation) coordinates. -" - (cond - ((subtypep (type-of positions) '3dc) - (progn ; convert xyz->aed, keep azimuth and elevation only. - (mat-trans - (butlast - (mat-trans - (mapcar - (lambda (xyz) (multiple-value-list (om:xyz->aed (first xyz) (second xyz) (third xyz)))) - (mat-trans (list (x-points positions) (y-points positions) (z-points positions))) - )))))) - ((subtypep (type-of positions) 'list) - (cond - ((= 2 (length (first positions))) - positions) - ((= 3 (length (first positions))) - (mat-trans - (butlast - (mat-trans - (mapcar - (lambda (xyz) (multiple-value-list (om:xyz->aed (first xyz) (second xyz) (third xyz)))) - positions - ))))) - (t (error "Positions must consist of lists of length 2 (ae) or 3 (xyz).")) - )) - (t (error "Positions must be of type 3dc or list.")))) -|# ; ####### High-level API ########## @@ -159,7 +124,7 @@ ) ; (sox-hoaencode-gain-single-component 1 1 45 0) -; what is the difference between "order" and "degree"? +; @AN: what is the difference between "order" and "degree"? (defun sox-hoaencode-gains-by-order (order azimuth_deg elevation_deg) @@ -178,7 +143,7 @@ (defclass! sox-hoaencode (sox-input) ( - (gain :accessor gain :initarg :gain :initform 0 :documentation "gain value in dB (decibel)") + (gains :accessor gains :initarg :gains :initform nil :documentation *sox-gain-doc*) (azimuth :accessor azimuth :initarg :azimuth :initform 0 :documentation "azimuth angle in degrees") (elevation :accessor elevation :initarg :elevation :initform 0 :documentation "elevation angle in degrees") (order :accessor order :initarg :order :initform 3 :documentation *sox-hoaencode-order-doc*) -- Gitblit v1.9.1