Browse Source

Arnold Krille firewire patch.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3948 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/v1.9.6
sletz 15 years ago
parent
commit
d909ba9f57
2 changed files with 14 additions and 3 deletions
  1. +4
    -1
      ChangeLog
  2. +10
    -2
      linux/firewire/JackFFADODriver.cpp

+ 4
- 1
ChangeLog View File

@@ -23,7 +23,8 @@ Paul Davis
Peter L Jones Peter L Jones
Devin Anderson Devin Anderson
Josh Green Josh Green
Mario Lang
Mario Lang
Arnold Krille
--------------------------- ---------------------------
Jackdmp changes log Jackdmp changes log
@@ -31,6 +32,8 @@ Mario Lang


2010-03-06 Stephane Letz <letz@grame.fr> 2010-03-06 Stephane Letz <letz@grame.fr>
* Arnold Krille firewire patch.
* Raise JACK_DRIVER_PARAM_STRING_MAX and JACK_PARAM_STRING_MAX to 127 otherwise some audio drivers cannot be loaded on OSX. * Raise JACK_DRIVER_PARAM_STRING_MAX and JACK_PARAM_STRING_MAX to 127 otherwise some audio drivers cannot be loaded on OSX.


2010-03-04 Stephane Letz <letz@grame.fr> 2010-03-04 Stephane Letz <letz@grame.fr>


+ 10
- 2
linux/firewire/JackFFADODriver.cpp View File

@@ -753,12 +753,20 @@ extern "C"
strcpy (desc->name, "firewire"); // size MUST be less then JACK_DRIVER_NAME_MAX + 1 strcpy (desc->name, "firewire"); // size MUST be less then JACK_DRIVER_NAME_MAX + 1
strcpy(desc->desc, "Linux FFADO API based audio backend"); // size MUST be less then JACK_DRIVER_PARAM_DESC + 1 strcpy(desc->desc, "Linux FFADO API based audio backend"); // size MUST be less then JACK_DRIVER_PARAM_DESC + 1
desc->nparams = 11;
desc->nparams = 12;


params = (jack_driver_param_desc_t *)calloc (desc->nparams, sizeof (jack_driver_param_desc_t)); params = (jack_driver_param_desc_t *)calloc (desc->nparams, sizeof (jack_driver_param_desc_t));
desc->params = params; desc->params = params;


i = 0; i = 0;
strcpy (params[i].name, "device");
params[i].character = 'd';
params[i].type = JackDriverParamString;
strcpy (params[i].value.str, "hw:0");
strcpy (params[i].short_desc, "The FireWire device to use.");
strcpy (params[i].long_desc, "The FireWire device to use. Please consult the FFADO documentation for more info.");

i++;
strcpy (params[i].name, "period"); strcpy (params[i].name, "period");
params[i].character = 'p'; params[i].character = 'p';
params[i].type = JackDriverParamUInt; params[i].type = JackDriverParamUInt;
@@ -881,7 +889,7 @@ extern "C"


switch (param->character) { switch (param->character) {
case 'd': case 'd':
device_name = param->value.str;
device_name = const_cast<char*>(param->value.str);
break; break;
case 'p': case 'p':
cmlparams.period_size = param->value.ui; cmlparams.period_size = param->value.ui;


Loading…
Cancel
Save