diff options
Diffstat (limited to 'guile/starlet/fixture-library/tadm')
| -rw-r--r-- | guile/starlet/fixture-library/tadm/led-bar.scm | 24 | ||||
| -rw-r--r-- | guile/starlet/fixture-library/tadm/led-foh.scm | 46 |
2 files changed, 12 insertions, 58 deletions
diff --git a/guile/starlet/fixture-library/tadm/led-bar.scm b/guile/starlet/fixture-library/tadm/led-bar.scm index a04ed5e..45c4e34 100644 --- a/guile/starlet/fixture-library/tadm/led-bar.scm +++ b/guile/starlet/fixture-library/tadm/led-bar.scm @@ -1,7 +1,7 @@ ;; ;; starlet/fixture-library/tadm/led-bar.scm ;; -;; Copyright © 2020-2021 Thomas White <taw@bitwiz.org.uk> +;; Copyright © 2020-2022 Thomas White <taw@bitwiz.org.uk> ;; ;; This file is part of Starlet. ;; @@ -19,24 +19,24 @@ ;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;; (define-module (starlet fixture-library tadm led-bar) - #:use-module (oop goops) + #:use-module (starlet scanout) #:use-module (starlet fixture) + #:use-module (starlet attributes) #:use-module (starlet colours) + #:use-module (starlet utils) + #:use-module (starlet attributes) #:export (<tadm-led-bar>)) +(define-fixture -(define-class <tadm-led-bar> (<fixture>) - (attributes - #:init-form (list - (attr-continuous 'intensity '(0 100) 0) - (attr-colour 'colour white)))) + <tadm-led-bar> + (fixture-attributes + (attr-continuous intensity '(0 100) 0) + (attr-colour colour white)) -(define-method (scanout-fixture (fixture <tadm-led-bar>) - get-attr set-chan8 set-chan16) - - (let ((intensity (get-attr 'intensity)) - (rgb (colour-as-rgb (get-attr 'colour)))) + (let ((intensity (get-attr intensity)) + (rgb (colour-as-rgb (get-attr colour)))) (set-chan8 1 17) (set-chan8 2 (percent->dmxval8 intensity)) (set-chan8 3 0) diff --git a/guile/starlet/fixture-library/tadm/led-foh.scm b/guile/starlet/fixture-library/tadm/led-foh.scm deleted file mode 100644 index 18ad15f..0000000 --- a/guile/starlet/fixture-library/tadm/led-foh.scm +++ /dev/null @@ -1,46 +0,0 @@ -;; -;; starlet/fixture-library/tadm/led-foh.scm -;; -;; Copyright © 2020-2021 Thomas White <taw@bitwiz.org.uk> -;; -;; This file is part of Starlet. -;; -;; Starlet is free software: you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. -;; -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. -;; -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see <http://www.gnu.org/licenses/>. -;; -(define-module (starlet fixture-library tadm led-foh) - #:use-module (oop goops) - #:use-module (starlet fixture) - #:use-module (starlet colours) - #:export (<tadm-led-foh>)) - - -(define-class <tadm-led-foh> (<fixture>) - (attributes - #:init-form (list - (attr-continuous 'intensity '(0 100) 0) - (attr-colour 'colour white)))) - - -(define-method (scanout-fixture (fixture <tadm-led-foh>) - get-attr set-chan8 set-chan16) - - (let ((intensity (get-attr 'intensity)) - (rgb (colour-as-rgb (get-attr 'colour)))) - (set-chan8 1 (percent->dmxval8 intensity)) - (set-chan8 2 255) - (set-chan8 3 (percent->dmxval8 (car rgb))) - (set-chan8 4 (percent->dmxval8 (cadr rgb))) - (set-chan8 5 (percent->dmxval8 (caddr rgb))) - (set-chan8 6 0))) - |