Commit 0dd4bee8 authored by Brandon Invergo's avatar Brandon Invergo

Clean up use of Guile's module system

parent 17944120
......@@ -14,19 +14,18 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol alsa)
:export (make-alsa-ctl
alsa-ctl?
alsa-ctl-numid
alsa-ctl-type
alsa-ctl-descr
set-alsa-ctl-descr!
define-alsa-ctl
open-alsa-ctl
set-ctl
toggle-ctl
turn-off-ctls))
(use-modules (srfi srfi-9))
#:use-module (srfi srfi-9)
#:export (make-alsa-ctl
alsa-ctl?
alsa-ctl-numid
alsa-ctl-type
alsa-ctl-descr
set-alsa-ctl-descr!
define-alsa-ctl
open-alsa-ctl
set-ctl
toggle-ctl
turn-off-ctls))
(define-record-type <alsa-ctl>
(make-alsa-ctl numid type descr)
......
......@@ -14,36 +14,35 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol device)
:export (make-control
control?
control-device
control-input-event
control-alsa-ctl
connect-control
define-control
make-input-max-parameter
configure-device
midi-note-button
make-midi-note-button-toggle
remap-button
make-remap-button-toggle
system-button
make-system-button-toggle
rel-knob-to-button
make-abs-knob-to-button
system-abs-knob
system-rel-knob
make-abs-to-rel-system-knob
midi-control-abs-knob
make-rel-to-abs-midi-control-knob
midi-note-pad))
(use-modules (srfi srfi-9)
(ice-9 optargs)
(librekontrol core)
(librekontrol alsa)
(librekontrol input)
((librekontrol midi) #:prefix midi:))
#:use-module (srfi srfi-9)
#:use-module (ice-9 optargs)
#:use-module (librekontrol core)
#:use-module (librekontrol alsa)
#:use-module (librekontrol input)
#:use-module ((librekontrol midi) #:prefix midi:)
#:export (make-control
control?
control-device
control-input-event
control-alsa-ctl
connect-control
define-control
make-input-max-parameter
configure-device
midi-note-button
make-midi-note-button-toggle
remap-button
make-remap-button-toggle
system-button
make-system-button-toggle
rel-knob-to-button
make-abs-knob-to-button
system-abs-knob
system-rel-knob
make-abs-to-rel-system-knob
midi-control-abs-knob
make-rel-to-abs-midi-control-knob
midi-note-pad))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Defining "control" structures and mapping them to callback ;;
......
......@@ -14,10 +14,10 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol devices ni-a4dj)
:export (alsa-name
input-name
led-current-input))
(use-modules (librekontrol alsa))
#:use-module (librekontrol alsa)
#:export (alsa-name
input-name
led-current-input))
(define alsa-name "Audio4DJ")
(define input-name #f)
......
......@@ -14,14 +14,14 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol devices ni-a8dj)
:export (alsa-name
input-name
led-current-input
led-gnd-lift-vinyl
led-gnd-lift-cd
led-gnd-lift-phono
led-software-lock))
(use-modules (librekontrol alsa))
#:use-module (librekontrol alsa)
#:export (alsa-name
input-name
led-current-input
led-gnd-lift-vinyl
led-gnd-lift-cd
led-gnd-lift-phono
led-software-lock))
(define alsa-name "Audio8DJ")
(define input-name #f)
......
......@@ -14,24 +14,24 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol devices ni-ak1)
:export (alsa-name
input-name
button-left
button-middle
button-right
knob-ring
led-left
led-middle
led-right
led-ring
left
middle
right
knob
knob-max))
(use-modules (librekontrol input)
(librekontrol alsa)
(librekontrol device))
#:use-module (librekontrol input)
#:use-module (librekontrol alsa)
#:use-module (librekontrol device)
#:export (alsa-name
input-name
button-left
button-middle
button-right
knob-ring
led-left
led-middle
led-right
led-ring
left
middle
right
knob
knob-max))
(define alsa-name "AudioKontrol1")
(define input-name "Audio Kontrol 1")
......
This diff is collapsed.
......@@ -14,96 +14,96 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol devices ni-kontrolx1)
:export (alsa-name
input-name
led-fx-a-on
led-fx-a-1
led-fx-a-2
led-fx-a-3
led-fx-b-on
led-fx-b-1
led-fx-b-2
led-fx-b-3
pot-fx-a-dry/wet
pot-fx-a-1
pot-fx-a-2
pot-fx-a-3
pot-fx-b-dry/wet
pot-fx-b-1
pot-fx-b-2
pot-fx-b-3
led-hotcue
led-shift-white
led-shift-green
led-deck-a-fx1
led-deck-a-fx2
led-deck-a-in
led-deck-a-out
led-deck-a-<beat
led-deck-a-beat>
led-deck-a-cue
led-deck-a-cup
led-deck-a-play
led-deck-a-sync
knob-deck-a-1
knob-deck-a-2
led-deck-b-fx1
led-deck-b-fx2
led-deck-b-in
led-deck-b-out
led-deck-b-<beat
led-deck-b-beat>
led-deck-b-cue
led-deck-b-cup
led-deck-b-play
led-deck-b-sync
knob-deck-b-1
knob-deck-b-2
button-unknown-1
button-unknown-2
button-unknown-3
button-unknown-4
button-unknown-5
button-unknown-6
button-unknown-7
button-unknown-8
button-unknown-9
button-unknown-10
button-unknown-11
button-unknown-12
button-unknown-13
button-unknown-14
button-unknown-15
button-unknown-16
button-unknown-17
button-unknown-18
button-unknown-19
button-unknown-20
button-unknown-21
button-unknown-22
button-unknown-23
button-unknown-24
button-unknown-25
button-unknown-26
button-unknown-27
button-unknown-28
button-unknown-29
button-unknown-30
button-unknown-31
button-unknown-32
button-unknown-33
button-unknown-34
button-unknown-35
button-unknown-36
button-unknown-37
button-unknown-38
button-unknown-39
button-unknown-40
pot-max
knob-max))
(use-modules (librekontrol input)
(librekontrol alsa)
(librekontrol device))
#:use-module (librekontrol input)
#:use-module (librekontrol alsa)
#:use-module (librekontrol device)
#:export (alsa-name
input-name
led-fx-a-on
led-fx-a-1
led-fx-a-2
led-fx-a-3
led-fx-b-on
led-fx-b-1
led-fx-b-2
led-fx-b-3
pot-fx-a-dry/wet
pot-fx-a-1
pot-fx-a-2
pot-fx-a-3
pot-fx-b-dry/wet
pot-fx-b-1
pot-fx-b-2
pot-fx-b-3
led-hotcue
led-shift-white
led-shift-green
led-deck-a-fx1
led-deck-a-fx2
led-deck-a-in
led-deck-a-out
led-deck-a-<beat
led-deck-a-beat>
led-deck-a-cue
led-deck-a-cup
led-deck-a-play
led-deck-a-sync
knob-deck-a-1
knob-deck-a-2
led-deck-b-fx1
led-deck-b-fx2
led-deck-b-in
led-deck-b-out
led-deck-b-<beat
led-deck-b-beat>
led-deck-b-cue
led-deck-b-cup
led-deck-b-play
led-deck-b-sync
knob-deck-b-1
knob-deck-b-2
button-unknown-1
button-unknown-2
button-unknown-3
button-unknown-4
button-unknown-5
button-unknown-6
button-unknown-7
button-unknown-8
button-unknown-9
button-unknown-10
button-unknown-11
button-unknown-12
button-unknown-13
button-unknown-14
button-unknown-15
button-unknown-16
button-unknown-17
button-unknown-18
button-unknown-19
button-unknown-20
button-unknown-21
button-unknown-22
button-unknown-23
button-unknown-24
button-unknown-25
button-unknown-26
button-unknown-27
button-unknown-28
button-unknown-29
button-unknown-30
button-unknown-31
button-unknown-32
button-unknown-33
button-unknown-34
button-unknown-35
button-unknown-36
button-unknown-37
button-unknown-38
button-unknown-39
button-unknown-40
pot-max
knob-max))
(define alsa-name "TraktorKontrolX")
(define input-name "Traktor Kontrol X1")
......
......@@ -14,88 +14,88 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol devices ni-kore)
:export (alsa-name
input-name
led-f1
led-f2
led-f3
led-f4
led-f5
led-f6
led-f7
led-f8
led-touch1
led-touch2
led-touch3
led-touch4
led-touch5
led-touch6
led-touch7
led-touch8
button-1
button-2
button-3
button-4
button-5
button-6
button-7
button-8
button-knob-1
button-knob-2
button-knob-3
button-knob-4
button-knob-5
button-knob-6
button-knob-7
button-knob-8
knob-1
knob-2
knob-3
knob-4
knob-5
knob-6
knob-7
knob-8
led-left
led-right
led-up
led-down
led-stop
led-play
led-record
led-listen
led-lcd
button-right
button-down
button-up
button-left
button-listen
button-record
button-playpause
button-stop
led-menu
led-sound
led-esc
led-view
led-enter
led-control
button-menu
button-control
button-enter
button-view
button-esc
button-sound
knob-rotary
knob-input
knob-phones
knob-output
button-lcd-backlight
knob-max
knob-volume-max
knob-rotary-max))
(use-modules (librekontrol input)
(librekontrol alsa)
(librekontrol device))
#:use-module (librekontrol input)
#:use-module (librekontrol alsa)
#:use-module (librekontrol device)
#:export (alsa-name
input-name
led-f1
led-f2
led-f3
led-f4
led-f5
led-f6
led-f7
led-f8
led-touch1
led-touch2
led-touch3
led-touch4
led-touch5
led-touch6
led-touch7
led-touch8
button-1
button-2
button-3
button-4
button-5
button-6
button-7
button-8
button-knob-1
button-knob-2
button-knob-3
button-knob-4
button-knob-5
button-knob-6
button-knob-7
button-knob-8
knob-1
knob-2
knob-3
knob-4
knob-5
knob-6
knob-7
knob-8
led-left
led-right
led-up
led-down
led-stop
led-play
led-record
led-listen
led-lcd
button-right
button-down
button-up
button-left
button-listen
button-record
button-playpause
button-stop
led-menu
led-sound
led-esc
led-view
led-enter
led-control
button-menu
button-control
button-enter
button-view
button-esc
button-sound
knob-rotary
knob-input
knob-phones
knob-output
button-lcd-backlight
knob-max
knob-volume-max
knob-rotary-max))
(define alsa-name "KoreController")
(define input-name "Kore Controller")
......
......@@ -14,88 +14,88 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol devices ni-kore2)
:export (alsa-name
input-name
led-f1
led-f2
led-f3
led-f4
led-f5
led-f6
led-f7
led-f8
led-touch1
led-touch2
led-touch3
led-touch4
led-touch5
led-touch6
led-touch7
led-touch8
button-1
button-2
button-3
button-4
button-5
button-6
button-7
button-8
button-knob-1
button-knob-2
button-knob-3
button-knob-4
button-knob-5
button-knob-6
button-knob-7
button-knob-8
knob-1
knob-2
knob-3
knob-4
knob-5
knob-6
knob-7
knob-8
led-left
led-right
led-up
led-down
led-stop
led-play
led-record
led-listen
led-lcd
button-right
button-down
button-up
button-left
button-listen
button-record
button-playpause
button-stop
led-menu
led-sound
led-esc
led-view
led-enter
led-control
button-menu
button-control
button-enter
button-view
button-esc
button-sound
knob-rotary
knob-input
knob-phones
knob-output
button-lcd-backlight
knob-max
knob-volume-max
knob-rotary-max))
(use-modules (librekontrol input)
(librekontrol alsa)
(librekontrol device))
#:use-module (librekontrol input)
#:use-module (librekontrol alsa)
#:use-module (librekontrol device)
#:export (alsa-name
input-name
led-f1
led-f2
led-f3
led-f4
led-f5
led-f6
led-f7
led-f8
led-touch1
led-touch2
led-touch3
led-touch4
led-touch5
led-touch6
led-touch7
led-touch8
button-1
button-2
button-3
button-4
button-5
button-6
button-7
button-8
button-knob-1
button-knob-2
button-knob-3
button-knob-4
button-knob-5
button-knob-6
button-knob-7
button-knob-8
knob-1
knob-2
knob-3
knob-4
knob-5
knob-6
knob-7
knob-8
led-left
led-right
led-up
led-down
led-stop
led-play
led-record
led-listen
led-lcd
button-right
button-down
button-up
button-left
button-listen
button-record
button-playpause
button-stop
led-menu
led-sound
led-esc
led-view
led-enter
led-control
button-menu
button-control
button-enter
button-view
button-esc
button-sound
knob-rotary
knob-input
knob-phones
knob-output
button-lcd-backlight
knob-max
knob-volume-max
knob-rotary-max))
(define alsa-name "KoreController2")
(define input-name "Kore Controller 2")
......
......@@ -14,211 +14,211 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol devices ni-maschine)
:export (alsa-name