From ab439084f269a856a9a6bdece27beeda60ff80fa Mon Sep 17 00:00:00 2001 From: rncbc Date: Sat, 19 Jan 2008 23:28:14 +0000 Subject: [PATCH] - USX2Y driver updates to enable JACK MIDI devices to show up in raw-usb mode (previously, raw-usb mode didn't initialize or call MIDI drivers properly). Signed-off-by: Krzysztof Foltman Signed-off-by: Rui Nuno Capela git-svn-id: svn+ssh://jackaudio.org/trunk/jack@1085 0c269be4-1314-0410-8aa9-9f06e86f4224 --- configure.ac | 2 +- drivers/alsa/usx2y.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 93f761f..31a1fa1 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ dnl changes are made dnl --- JACK_MAJOR_VERSION=0 JACK_MINOR_VERSION=109 -JACK_MICRO_VERSION=0 +JACK_MICRO_VERSION=1 dnl --- dnl HOWTO: updating the jack protocol version diff --git a/drivers/alsa/usx2y.c b/drivers/alsa/usx2y.c index ff6ca93..f90e10b 100644 --- a/drivers/alsa/usx2y.c +++ b/drivers/alsa/usx2y.c @@ -229,6 +229,9 @@ usx2y_driver_start (alsa_driver_t *driver) return -1; } + if (driver->midi && !driver->xrun_recovery) + (driver->midi->start)(driver->midi); + if (driver->playback_handle) { /* int i, j; */ /* char buffer[2000]; */ @@ -379,6 +382,9 @@ usx2y_driver_stop (alsa_driver_t *driver) munmap(h->hwdep_pcm_shm, sizeof(snd_usX2Y_hwdep_pcm_shm_t)); + if (driver->midi && !driver->xrun_recovery) + (driver->midi->stop)(driver->midi); + return 0; } @@ -481,6 +487,9 @@ usx2y_driver_read (alsa_driver_t *driver, jack_nframes_t nframes) return 0; } + if (driver->midi) + (driver->midi->read)(driver->midi, nframes); + nread = 0; if (snd_pcm_mmap_begin (driver->capture_handle, @@ -555,6 +564,9 @@ usx2y_driver_write (alsa_driver_t* driver, jack_nframes_t nframes) return 0; } + if (driver->midi) + (driver->midi->write)(driver->midi, nframes); + nwritten = 0; /* check current input monitor request status */