Browse Source

Karsten Wiese correction for ALSA usx2y driver.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1314 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.60
sletz 19 years ago
parent
commit
aaa10c7587
2 changed files with 10 additions and 6 deletions
  1. +2
    -1
      ChangeLog
  2. +8
    -5
      linux/alsa/usx2y.c

+ 2
- 1
ChangeLog View File

@@ -5,7 +5,8 @@
2006-11-29 Stephane Letz <letz@grame.fr> 2006-11-29 Stephane Letz <letz@grame.fr>
* Correct JackWinEnvent::Allocate (handle the ERROR_ALREADY_EXISTS case). Correct JackEngine::ClientExternalNew.
* Correct JackWinEnvent::Allocate (handle the ERROR_ALREADY_EXISTS case). Correct JackEngine::ClientExternalNew.
* Karsten Wiese correction for ALSA usx2y driver.
2006-11-22 Stephane Letz <letz@grame.fr> 2006-11-22 Stephane Letz <letz@grame.fr>


+ 8
- 5
linux/alsa/usx2y.c View File

@@ -210,16 +210,19 @@ usx2y_driver_get_channel_addresses_capture (alsa_driver_t *driver,
static int static int
usx2y_driver_start (alsa_driver_t *driver) usx2y_driver_start (alsa_driver_t *driver)
{ {
int err;
int err, i;
snd_pcm_uframes_t poffset, pavail; snd_pcm_uframes_t poffset, pavail;


usx2y_t *h = (usx2y_t *) driver->hw->private; usx2y_t *h = (usx2y_t *) driver->hw->private;


if (driver->capture_nchannels == 4) {
for (i = 0; i < driver->capture_nchannels; i++)
// US428 channels 3+4 are on a seperate 2 channel stream. // US428 channels 3+4 are on a seperate 2 channel stream.
// ALSA thinks its 1 stream with 4 channels, so we have to hack here.
driver->capture_interleave_skip = 2 * driver->capture_sample_bytes;
}
// ALSA thinks its 1 stream with 4 channels.
driver->capture_interleave_skip[i] = 2 * driver->capture_sample_bytes;


driver->playback_interleave_skip[0] = 2 * driver->playback_sample_bytes;
driver->playback_interleave_skip[1] = 2 * driver->playback_sample_bytes;


driver->poll_last = 0; driver->poll_last = 0;
driver->poll_next = 0; driver->poll_next = 0;


Loading…
Cancel
Save