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

Clean up use of Guile's module system

parent 17944120
......@@ -14,7 +14,8 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol alsa)
:export (make-alsa-ctl
#:use-module (srfi srfi-9)
#:export (make-alsa-ctl
alsa-ctl?
alsa-ctl-numid
alsa-ctl-type
......@@ -26,8 +27,6 @@
toggle-ctl
turn-off-ctls))
(use-modules (srfi srfi-9))
(define-record-type <alsa-ctl>
(make-alsa-ctl numid type descr)
alsa-ctl?
......
......@@ -14,7 +14,13 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol device)
:export (make-control
#: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
......@@ -38,13 +44,6 @@
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:))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Defining "control" structures and mapping them to callback ;;
;; functions ;;
......
......@@ -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
#:use-module (librekontrol alsa)
#:export (alsa-name
input-name
led-current-input))
(use-modules (librekontrol alsa))
(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
#: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))
(use-modules (librekontrol alsa))
(define alsa-name "Audio8DJ")
(define input-name #f)
......
......@@ -14,7 +14,10 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol devices ni-ak1)
:export (alsa-name
#:use-module (librekontrol input)
#:use-module (librekontrol alsa)
#:use-module (librekontrol device)
#:export (alsa-name
input-name
button-left
button-middle
......@@ -29,9 +32,6 @@
right
knob
knob-max))
(use-modules (librekontrol input)
(librekontrol alsa)
(librekontrol device))
(define alsa-name "AudioKontrol1")
(define input-name "Audio Kontrol 1")
......
......@@ -14,7 +14,10 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol devices ni-kontrols4)
:export (alsa-name
#:use-module (librekontrol input)
#:use-module (librekontrol alsa)
#:use-module (librekontrol device)
#:export (alsa-name
input-name
led-master-quant
led-master-headphone
......@@ -268,9 +271,6 @@
knob-unknown-9
pot-max
knob-max))
(use-modules (librekontrol input)
(librekontrol alsa)
(librekontrol device))
(define alsa-name "TraktorKontrolS")
(define input-name "Traktor Kontrol S4")
......
......@@ -14,7 +14,10 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol devices ni-kontrolx1)
:export (alsa-name
#: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
......@@ -101,9 +104,6 @@
button-unknown-40
pot-max
knob-max))
(use-modules (librekontrol input)
(librekontrol alsa)
(librekontrol device))
(define alsa-name "TraktorKontrolX")
(define input-name "Traktor Kontrol X1")
......
......@@ -14,7 +14,10 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol devices ni-kore)
:export (alsa-name
#:use-module (librekontrol input)
#:use-module (librekontrol alsa)
#:use-module (librekontrol device)
#:export (alsa-name
input-name
led-f1
led-f2
......@@ -93,9 +96,6 @@
knob-max
knob-volume-max
knob-rotary-max))
(use-modules (librekontrol input)
(librekontrol alsa)
(librekontrol device))
(define alsa-name "KoreController")
(define input-name "Kore Controller")
......
......@@ -14,7 +14,10 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol devices ni-kore2)
:export (alsa-name
#:use-module (librekontrol input)
#:use-module (librekontrol alsa)
#:use-module (librekontrol device)
#:export (alsa-name
input-name
led-f1
led-f2
......@@ -93,9 +96,6 @@
knob-max
knob-volume-max
knob-rotary-max))
(use-modules (librekontrol input)
(librekontrol alsa)
(librekontrol device))
(define alsa-name "KoreController2")
(define input-name "Kore Controller 2")
......
......@@ -14,7 +14,10 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol devices ni-maschine)
:export (alsa-name
#:use-module (librekontrol input)
#:use-module (librekontrol alsa)
#:use-module (librekontrol device)
#:export (alsa-name
input-name
led-pad-1
led-pad-2
......@@ -216,9 +219,6 @@
knob-8
pad-max
knob-max))
(use-modules (librekontrol input)
(librekontrol alsa)
(librekontrol device))
(define alsa-name "MaschineControl")
(define input-name "Maschine Controller")
......
......@@ -14,7 +14,10 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol devices ni-rk2)
:export (alsa-name
#:use-module (librekontrol input)
#:use-module (librekontrol alsa)
#:use-module (librekontrol device)
#:export (alsa-name
input-name
led-1
led-2
......@@ -60,9 +63,6 @@
gain-2
gain-headphones
knob-max))
(use-modules (librekontrol input)
(librekontrol alsa)
(librekontrol device))
(define alsa-name "RigKontrol2")
(define input-name "RigKontrol2")
......
......@@ -14,7 +14,10 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol devices ni-rk3)
:export (alsa-name
#:use-module (librekontrol input)
#:use-module (librekontrol alsa)
#:use-module (librekontrol device)
#:export (alsa-name
input-name
led-1
led-2
......@@ -82,9 +85,6 @@
gain-2
gain-headphones
knob-max))
(use-modules (librekontrol input)
(librekontrol alsa)
(librekontrol device))
(define alsa-name "RigKontrol3")
(define input-name "RigKontrol3")
......
......@@ -14,7 +14,7 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol input)
:export (make-input-event
#:export (make-input-event
define-input-event))
(define-syntax-rule (make-input-event event-type event-code)
......
......@@ -14,11 +14,11 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (librekontrol midi)
:export (notes
#:use-module (rnrs enums)
#:export (notes
note->number
controls
control->number))
(use-modules (rnrs enums))
(define notes '("c" "c#" "d" "d#" "e" "f" "f#" "g" "g#" "a" "a#" "b"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment