Browse Source

Removed environmental variables from alsa_driver.c, prettified configure output.

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@748 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.109.0
trutkin 21 years ago
parent
commit
299f89d986
3 changed files with 14 additions and 64 deletions
  1. +13
    -0
      configure.in
  2. +0
    -63
      drivers/alsa/alsa_driver.c
  3. +1
    -1
      jackd/jackd.c

+ 13
- 0
configure.in View File

@@ -560,3 +560,16 @@ jackd/Makefile
jackd/jackd.1
libjack/Makefile
)

dnl
dnl Output summary message
dnl

echo
echo $PACKAGE $VERSION :
echo
echo \| Build with OSS support................................ : $HAVE_OSS
echo \| Build with ALSA support............................... : $HAVE_ALSA
echo \| Build with PortAudio support.......................... : $HAVE_PA
echo


+ 0
- 63
drivers/alsa/alsa_driver.c View File

@@ -2372,71 +2372,9 @@ driver_initialize (jack_client_t *client, const JSList * params)
int user_capture_nchnls = 0;
int user_playback_nchnls = 0;
int shorts_first = FALSE;
char *envvar;
const JSList * node;
const jack_driver_param_t * param;

/* before we do anything else, see if there are environment variables
for each parameter.
*/
if ((envvar = getenv ("JACK_ALSA_DEVICE")) != NULL) {
playback_pcm_name = envvar;
capture_pcm_name = envvar;
}

if ((envvar = getenv ("JACK_ALSA_HWMON")) != NULL) {
hw_monitoring = TRUE;
}

if ((envvar = getenv ("JACK_ALSA_SOFTMODE")) != NULL) {
soft_mode = TRUE;
}
if ((envvar = getenv ("JACK_ALSA_PERIOD_FRAMES")) != NULL) {
frames_per_interrupt = atoi (envvar);
}

if ((envvar = getenv ("JACK_ALSA_PERIODS")) != NULL) {
user_nperiods = atoi (envvar);
}

if ((envvar = getenv ("JACK_ALSA_SRATE")) != NULL) {
srate = atoi (envvar);
}

if ((envvar = getenv ("JACK_ALSA_DITHER")) != NULL) {
if (dither_opt (*envvar, &dither)) {
return NULL;
}
}

if ((envvar = getenv ("JACK_ALSA_CAPTURE")) != NULL) {
capture = atoi (envvar);
}

if ((envvar = getenv ("JACK_ALSA_PLAYBACK")) != NULL) {
playback = atoi (envvar);
}
if ((envvar = getenv ("JACK_ALSA_CAPTURE_NCHANNELS")) != NULL) {
monitor = atoi (envvar);
}

if ((envvar = getenv ("JACK_ALSA_PLAYBACK_NCHANNELS")) != NULL) {
monitor = atoi (envvar);
}

if ((envvar = getenv ("JACK_ALSA_MONITOR")) != NULL) {
monitor = atoi (envvar);
}

if ((envvar = getenv ("JACK_ALSA_SHORTS_FIRST")) != NULL) {
shorts_first = TRUE;
}


for (node = params; node; node = jack_slist_next (node)) {
param = (const jack_driver_param_t *) node->data;

@@ -2513,7 +2451,6 @@ driver_initialize (jack_client_t *client, const JSList * params)
break;

}

}
/* duplex is the default */


+ 1
- 1
jackd/jackd.c View File

@@ -239,7 +239,7 @@ jack_drivers_get_descriptor (JSList * drivers, const char * sofile)
dlsym (dlhandle, "driver_get_descriptor");

if ((dlerr = dlerror ()) != NULL) {
printf("%s\n", dlerr);
fprintf(stderr, "%s\n", dlerr);
dlclose (dlhandle);
free (filename);
return NULL;


Loading…
Cancel
Save