diff options
| author | Stephane Letz <letz@grame.fr> | 2012-10-24 09:55:29 +0200 |
|---|---|---|
| committer | Stephane Letz <letz@grame.fr> | 2012-10-24 09:55:29 +0200 |
| commit | 57e5daac1f046650b8dc7aa4fa13545def20f980 (patch) | |
| tree | 21c895c92bf0f08dc858101ad3484d897242bb22 /linux | |
| parent | 9b44eff09a05581ddd9ab56d427332858f30459a (diff) | |
| download | jack2-57e5daac1f046650b8dc7aa4fa13545def20f980.tar.gz | |
Fix ALSA driver inchannels/outchannels types.
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/alsa/JackAlsaDriver.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp index 65098df6..805b4d2b 100644 --- a/linux/alsa/JackAlsaDriver.cpp +++ b/linux/alsa/JackAlsaDriver.cpp @@ -779,9 +779,9 @@ SERVER_EXPORT const jack_driver_desc_t* driver_get_descriptor () " s - shaped\n" " t - triangular"); - value.i = 0; - jack_driver_descriptor_add_parameter(desc, &filler, "inchannels", 'i', JackDriverParamInt, &value, NULL, "Number of capture channels (defaults to hardware max)", NULL); - jack_driver_descriptor_add_parameter(desc, &filler, "outchannels", 'o', JackDriverParamInt, &value, NULL, "Number of playback channels (defaults to hardware max)", NULL); + value.ui = 0; + jack_driver_descriptor_add_parameter(desc, &filler, "inchannels", 'i', JackDriverParamUInt, &value, NULL, "Number of capture channels (defaults to hardware max)", NULL); + jack_driver_descriptor_add_parameter(desc, &filler, "outchannels", 'o', JackDriverParamUInt, &value, NULL, "Number of playback channels (defaults to hardware max)", NULL); value.i = FALSE; jack_driver_descriptor_add_parameter(desc, &filler, "shorts", 'S', JackDriverParamBool, &value, NULL, "Try 16-bit samples before 32-bit", NULL); @@ -892,8 +892,9 @@ SERVER_EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLocke case 'n': user_nperiods = param->value.ui; - if (user_nperiods < 2) /* enforce minimum value */ + if (user_nperiods < 2) { /* enforce minimum value */ user_nperiods = 2; + } break; case 's': @@ -977,8 +978,9 @@ void SetTime(jack_time_t time) int Restart() { int res; - if ((res = g_alsa_driver->Stop()) == 0) + if ((res = g_alsa_driver->Stop()) == 0) { res = g_alsa_driver->Start(); + } return res; } |