diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | apps/Makefile | 1 | ||||
| -rwxr-xr-x | apps/configure | 2 | ||||
| -rw-r--r-- | apps/dolmetschctl.c | 12 | ||||
| -rw-r--r-- | apps/midi.c | 93 | ||||
| -rw-r--r-- | apps/midi.h | 36 |
6 files changed, 140 insertions, 5 deletions
@@ -1,3 +1,4 @@ +contrib/alsa-utils* contrib/avr-utils contrib/.spreadavr.prepared apps/include.mk diff --git a/apps/Makefile b/apps/Makefile index a5e36f0..90ad0fb 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -27,6 +27,7 @@ endif EXECUTABLE := dolmetschctl C_OBJS := osc.o \ + midi.o \ dolmetschctl.o C_SRCS := $(C_OBJS:%.o=%.c) diff --git a/apps/configure b/apps/configure index 597ba07..f96a329 100755 --- a/apps/configure +++ b/apps/configure @@ -88,7 +88,7 @@ rm -f config.h rm -f include.mk case $TARGET in Linux) - LDFLAGS=$LD_FLAGS' -llo -lpthread' + LDFLAGS=$LD_FLAGS' -lasound -llo -lpthread' ;; *) echo "platform not supported" diff --git a/apps/dolmetschctl.c b/apps/dolmetschctl.c index e60dbcc..0fc9877 100644 --- a/apps/dolmetschctl.c +++ b/apps/dolmetschctl.c @@ -26,6 +26,8 @@ #include <unistd.h> #include "osc.h" +#include "midi.h" + void print_version() { @@ -39,15 +41,17 @@ void print_version() #endif } - int main(int argc, char* argv[]) { lo_server_thread st = osc_init("7770"); + // TODO: check if this worked! + + midi_t m; + if(midi_init(&m, "hw:2,0,0")) + return -1; osc_start(st); - while (1) { - usleep(1000); - } + midi_run(&m); osc_stop(st); return 0; diff --git a/apps/midi.c b/apps/midi.c new file mode 100644 index 0000000..45cb12f --- /dev/null +++ b/apps/midi.c @@ -0,0 +1,93 @@ +/* + * dolmetschctl + * + * + * Copyright (C) 2015 Christian Pointner <equinox@spreadspace.org> + * + * This file is part of dolmetschctl. + * + * dolmetschctl 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 + * any later version. + * + * dolmetschctl 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 dolmetschctl. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "config.h" + +#include <stdio.h> +#include <error.h> +#include <poll.h> + +#include "midi.h" + + +int midi_init(midi_t* m, const char* device) +{ + if(!m) + return -1; + + int ret = snd_rawmidi_open(&(m->input_), &(m->output_), device, SND_RAWMIDI_NONBLOCK); + if(ret < 0) { + error(0, 0, "cannot open midi port '%s': %s", device, snd_strerror(ret)); + return ret; + } + + return 0; +} + +void midi_run(midi_t* m) +{ + if(!m) + return; + + int npfds; + struct pollfd *pfds; + + npfds = snd_rawmidi_poll_descriptors_count(m->input_); + pfds = alloca(npfds * sizeof(struct pollfd)); + snd_rawmidi_poll_descriptors(m->input_, pfds, npfds); + for (;;) { + int err = poll(pfds, npfds, 200); + if(err < 0 && errno == EINTR) + break; + if(err < 0) { + error(0, errno, "poll failed"); + break; + } + /* if(err == 0) { */ + /* // TIMEOUT */ + /* } */ + + unsigned short revents; + if((err = snd_rawmidi_poll_descriptors_revents(m->input_, pfds, npfds, &revents)) < 0) { + error(0, 0, "cannot get poll events: %s", snd_strerror(errno)); + break; + } + if(revents & (POLLERR | POLLHUP)) + break; + if(!(revents & POLLIN)) + continue; + + u_int8_t buf[256]; + int ret = snd_rawmidi_read(m->input_, buf, sizeof(buf)); + if (ret == -EAGAIN) + continue; + if(ret < 0) { + error(0, 0, "cannot read from midi port: %s", snd_strerror(ret)); + break; + } + + int i; + for (i = 0; i < ret; ++i) + printf("%02X%c", buf[i], (i >= (ret-1)) ? '\n' : ' '); + } + +} diff --git a/apps/midi.h b/apps/midi.h new file mode 100644 index 0000000..176b528 --- /dev/null +++ b/apps/midi.h @@ -0,0 +1,36 @@ +/* + * dolmetschctl + * + * + * Copyright (C) 2015 Christian Pointner <equinox@spreadspace.org> + * + * This file is part of dolmetschctl. + * + * dolmetschctl 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 + * any later version. + * + * dolmetschctl 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 dolmetschctl. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef DOLMETSCHCTL_midi_h_INCLUDED +#define DOLMETSCHCTL_midi_h_INCLUDED + +#include <alsa/asoundlib.h> + +typedef struct { + snd_rawmidi_t* input_; + snd_rawmidi_t* output_; +} midi_t; + +int midi_init(midi_t* m, const char* device); +void midi_run(midi_t* m); + +#endif |