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/sox-editors.lisp | 92 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 90 insertions(+), 2 deletions(-)
diff --git a/sources/sox-editors.lisp b/sources/sox-editors.lisp
index e4de232..01832d7 100644
--- a/sources/sox-editors.lisp
+++ b/sources/sox-editors.lisp
@@ -79,7 +79,7 @@
(let ((pos 0) pantxt gaintxt)
(setf pos (+ pos 5))
(om-add-subviews self (setf pantxt (om-make-dialog-item 'om-static-text
- (om-make-point 15 pos)
+ (om-make-point 5 pos)
(om-make-point soxconsole-trackw 16)
(string+ (pathname-name (nth (tracknum self) (list! (sound (sox-object self)))))
"." (pathname-type (nth (tracknum self) (list! (sound (sox-object self))))))
@@ -87,6 +87,10 @@
)))
(setf pos (+ pos 25))
(add-pan-controls self (sox-object self) pos)
+ ;(add-azi-controls self (sox-object self) pos)
+ ;(add-ele-controls self (sox-object self) pos)
+ ;(add-order-controls self (sox-object self) pos)
+
(om-add-subviews self (om-make-view 'graphic-numbox
:position (om-make-point 30 pos)
@@ -116,7 +120,7 @@
;%%%%%%% Editor for SOX-PAN %%%%%%%%%%%%%%%
(defmethod get-win-ed-size ((self sox-pan))
- (om-make-point (+ 2 (* (+ soxconsole-trackw 2) (max 1 (min 32 (length (list! (sound self))))))) 200))
+ (om-make-point (+ 2 (* (+ soxconsole-trackw 2) (max 1 (min 32 (length (list! (sound self))))))) 200)) ; should not have a case for lists
(defmethod add-pan-controls ((self sox-track-panel) (object sox-pan) posy)
(let ((pantxt (om-make-dialog-item 'om-static-text
@@ -144,8 +148,92 @@
:max-val (max 10 (* 50 (1- (numchannels object))))))
))
+;%%%%%%% Editor for SOX-HOAENCODE %%%%%%%%%%%%%%%
+
+(defmethod get-editor-class ((self sox-hoaencode)) 'sox-console-editor)
+
+(defmethod get-win-ed-size ((self sox-hoaencode))
+ (om-make-point (+ 2 (+ soxconsole-trackw 2)) 328))
+(defmethod add-azi-controls ((self sox-track-panel) (object sox-hoaencode) posy)
+ (let ((azitxt (om-make-dialog-item 'om-static-text
+ (om-make-point 28 (+ posy 156))
+ (om-make-point 65 16)
+ (string+ "azi: " (number-to-string (om-round (azimuth object) 3)))
+ :font *om-default-font1*
+ )))
+ (om-add-subviews self azitxt (om-make-view 'graphic-numbox
+ :position (om-make-point 40 (+ posy 132))
+ :size (om-make-point 26 26)
+ :pict (om-load-and-store-picture "dial" 'di)
+ :nbpict 65
+ :pict-size (om-make-point 24 24)
+ :di-action (om-dialog-item-act item
+ (let ((val (float (value item))))
+ (om-set-dialog-item-text azitxt (format nil "azi: ~3f" val))
+ (setf (azimuth object) val)
+ (report-modifications (om-view-container self))))
+ :font *om-default-font2*
+ :value (/ (azimuth object) 360)
+ :min-val 0 :max-val 360)
+ )
+ )
+ )
+
+(defmethod add-ele-controls ((self sox-track-panel) (object sox-hoaencode) posy)
+ (let ((eletxt (om-make-dialog-item 'om-static-text
+ (om-make-point 28 (+ posy 208))
+ (om-make-point 65 16)
+ (string+ "ele: " (number-to-string (om-round (elevation object) 3)))
+ :font *om-default-font1*
+ )))
+ (om-add-subviews self eletxt (om-make-view 'graphic-numbox
+ :position (om-make-point 40 (+ posy 184))
+ :size (om-make-point 26 26)
+ :pict (om-load-and-store-picture "dial" 'di)
+ :nbpict 65
+ :pict-size (om-make-point 24 24)
+ :di-action (om-dialog-item-act item
+ (let ((val (float (value item))))
+ (om-set-dialog-item-text eletxt (format nil "ele: ~3f" val))
+ (setf (elevation object) val)
+ (report-modifications (om-view-container self))))
+ :font *om-default-font2*
+ :value (/ (elevation object) 360)
+ :min-val 0 :max-val 360)
+ )
+ )
+ )
+
+(defmethod add-order-controls ((self sox-track-panel) (object sox-hoaencode) posy)
+ (let ((ordertxt (om-make-dialog-item 'om-static-text
+ (om-make-point 28 (+ posy 248))
+ (om-make-point 65 16)
+ (string+ "order: " (number-to-string (order object)))
+ :font *om-default-font1*
+ )))
+ (om-add-subviews self (om-make-dialog-item 'edit-numbox
+ (om-make-point 36 (+ posy 248))
+ (om-make-point 36 18)
+ (format nil " ~2D" (order object))
+
+ :di-action (om-dialog-item-act item
+ (let ((val (value item)))
+ (om-set-dialog-item-text ordertxt (format nil "order: ~1d" val))
+ (setf (order object) val)
+ (report-modifications (om-view-container self))))
+
+ :value (order object)
+ :font *om-default-font1*
+ :incr 1
+ :min-val 0 :max-val 5
+ ))
+ )
+ )
+
+
+
;%%%%%%% Editor for SOX-MIX-CONSOLE %%%%%%%%%%%%%%%
(defmethod get-win-ed-size ((self sox-mix-console))
--
Gitblit v1.9.1