Browse Source

Fix ALSA driver inchannels/outchannels types.

tags/1.9.9.5
Stephane Letz 12 years ago
parent
commit
57e5daac1f
1 changed files with 7 additions and 5 deletions
  1. +7
    -5
      linux/alsa/JackAlsaDriver.cpp

+ 7
- 5
linux/alsa/JackAlsaDriver.cpp View File

@@ -779,9 +779,9 @@ SERVER_EXPORT const jack_driver_desc_t* driver_get_descriptor ()
" s - shaped\n" " s - shaped\n"
" t - triangular"); " 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; value.i = FALSE;
jack_driver_descriptor_add_parameter(desc, &filler, "shorts", 'S', JackDriverParamBool, &value, NULL, "Try 16-bit samples before 32-bit", NULL); 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': case 'n':
user_nperiods = param->value.ui; user_nperiods = param->value.ui;
if (user_nperiods < 2) /* enforce minimum value */
if (user_nperiods < 2) { /* enforce minimum value */
user_nperiods = 2; user_nperiods = 2;
}
break; break;


case 's': case 's':
@@ -977,8 +978,9 @@ void SetTime(jack_time_t time)
int Restart() int Restart()
{ {
int res; int res;
if ((res = g_alsa_driver->Stop()) == 0)
if ((res = g_alsa_driver->Stop()) == 0) {
res = g_alsa_driver->Start(); res = g_alsa_driver->Start();
}
return res; return res;
} }




Loading…
Cancel
Save