From 5592dadf5af7bd95890259af689a72ade528f600 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 19 Oct 2021 20:06:06 +0200 Subject: Replace partial application functions with SRFI-26 "cut" --- guile/starlet/midi-control/faders.scm | 3 ++- guile/starlet/playback.scm | 5 +++-- guile/starlet/utils.scm | 11 ----------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/guile/starlet/midi-control/faders.scm b/guile/starlet/midi-control/faders.scm index 2af57e3..81764b5 100644 --- a/guile/starlet/midi-control/faders.scm +++ b/guile/starlet/midi-control/faders.scm @@ -26,6 +26,7 @@ #:use-module (starlet scanout) #:use-module (starlet utils) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module (oop goops) #:export (set-midi-control-map! state-on-fader)) @@ -90,7 +91,7 @@ (define (fixtures-with-attr fixture-list attr-name) - (let ((attrs (map (partial find-attr attr-name) fixture-list))) + (let ((attrs (map (cut find-attr <> attr-name) fixture-list))) (fold (lambda (fix attr old) (if attr (cons (cons fix (car old)) diff --git a/guile/starlet/playback.scm b/guile/starlet/playback.scm index f9baca7..55bbcf0 100644 --- a/guile/starlet/playback.scm +++ b/guile/starlet/playback.scm @@ -26,6 +26,7 @@ #:use-module (ice-9 atomic) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) + #:use-module (srfi srfi-26) #:use-module (srfi srfi-43) #:use-module (starlet fixture) #:use-module (starlet state) @@ -516,9 +517,9 @@ (define (make-fade-for-attribute-type type) (cond - ((eq? type 'continuous) (partial-start make-general-fade simple-fade)) + ((eq? type 'continuous) (cut make-general-fade simple-fade <...>)) ((eq? type 'list) make-list-attr-fade) - ((eq? type 'colour) (partial-start make-general-fade colour-fade)) + ((eq? type 'colour) (cut make-general-fade colour-fade <...>)) (else (raise-exception (make-exception (make-exception-with-message diff --git a/guile/starlet/utils.scm b/guile/starlet/utils.scm index d5441cb..16e3364 100644 --- a/guile/starlet/utils.scm +++ b/guile/starlet/utils.scm @@ -22,8 +22,6 @@ #:use-module (srfi srfi-1) #:export (print-hash-table copy-hash-table - partial - partial-start in-range mean flatten-sublists @@ -47,15 +45,6 @@ new-ht)) -(define (partial f second-val) - (lambda (first-val) - (f first-val second-val))) - - -(define (partial-start f first-val) - (lambda args - (apply f first-val args))) - (define (in-range a val1 val2) (or -- cgit v1.2.3