Browse Source

- 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 <wdev@foltman.com>
  Signed-off-by: Rui Nuno Capela <rncbc@rncbc.org>


git-svn-id: svn+ssh://jackaudio.org/trunk/jack@1085 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.109.2
rncbc 18 years ago
parent
commit
ab439084f2
2 changed files with 13 additions and 1 deletions
  1. +1
    -1
      configure.ac
  2. +12
    -0
      drivers/alsa/usx2y.c

+ 1
- 1
configure.ac View File

@@ -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


+ 12
- 0
drivers/alsa/usx2y.c View File

@@ -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 */


Loading…
Cancel
Save