Browse Source

[0.98.15] remove firewire driver; add valgrind patches

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@753 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.109.0
joq 21 years ago
parent
commit
741f2bfa90
3 changed files with 14 additions and 44 deletions
  1. +2
    -34
      configure.in
  2. +2
    -8
      drivers/Makefile.am
  3. +10
    -2
      libjack/client.c

+ 2
- 34
configure.in View File

@@ -15,7 +15,7 @@ dnl changes are made
dnl ---
JACK_MAJOR_VERSION=0
JACK_MINOR_VERSION=98
JACK_MICRO_VERSION=14
JACK_MICRO_VERSION=15

dnl ---
dnl HOWTO: updating the jack protocol version
@@ -411,41 +411,10 @@ fi

# Check which drivers can be built. The last one successfully
# configured becomes the default JACK driver; so the order of
# precedence is: alsa, oss, coreaudio, portaudio, iec61883, dummy.
# precedence is: alsa, oss, coreaudio, portaudio, dummy.

JACK_DEFAULT_DRIVER=\"dummy\"

jack_enable_iec61883="no"
AC_ARG_ENABLE(iec61883,
[ --enable-iec61883 enable the iec61883 driver],[
case "$enableval" in
"yes")
jack_enable_iec61883="yes"
;;
"no")
;;
*)
AC_MSG_ERROR([must use --enable-iec61883(=yes/no) or --disable-iec61883])
;;
esac
])
if test x$jack_enable_iec61883 != xno; then
AC_CHECK_LIB(raw1394, raw1394_iso_xmit_init,
[ AC_CHECK_HEADER(libraw1394/raw1394.h,
[ HAVE_RAW1394="true"
RAW1394_LIBS=-lraw1394
JACK_DEFAULT_DRIVER=\"iec61883\"
AC_MSG_WARN([IEC61883 driver is experimental])
],
HAVE_RAW1394="false")
])
else
HAVE_RAW1394="false"
fi
AC_SUBST(RAW1394_LIBS)
AM_CONDITIONAL(IEC61883, test x$HAVE_RAW1394 = xtrue)
AM_CONDITIONAL(HAVE_RAW1394, $HAVE_RAW1394)

AC_ARG_ENABLE(portaudio, [ --disable-portaudio ignore PortAudio driver ],
TRY_PORTAUDIO=$enableval , TRY_PORTAUDIO=yes )
HAVE_PA="false"
@@ -563,7 +532,6 @@ doc/reference.doxygen
drivers/Makefile
drivers/alsa/Makefile
drivers/dummy/Makefile
drivers/iec61883/Makefile
drivers/oss/Makefile
drivers/portaudio/Makefile
drivers/coreaudio/Makefile


+ 2
- 8
drivers/Makefile.am View File

@@ -6,12 +6,6 @@ else
ALSA_DIR =
endif

if HAVE_RAW1394
IEC61883_DIR = iec61883
else
IEC61883_DIR =
endif

if HAVE_OSS
OSS_DIR = oss
else
@@ -30,5 +24,5 @@ else
CA_DIR =
endif

SUBDIRS = $(ALSA_DIR) dummy $(IEC61883_DIR) $(OSS_DIR) $(PA_DIR) $(CA_DIR)
DIST_SUBDIRS = alsa dummy iec61883 oss portaudio coreaudio
SUBDIRS = $(ALSA_DIR) dummy $(OSS_DIR) $(PA_DIR) $(CA_DIR)
DIST_SUBDIRS = alsa dummy oss portaudio coreaudio

+ 10
- 2
libjack/client.c View File

@@ -774,6 +774,7 @@ jack_client_new (const char *client_name)
for (ptid = 0; ptid < client->n_port_types; ++ptid) {
client->port_segment[ptid].index =
client->engine->port_types[ptid].shm_registry_index;
client->port_segment[ptid].attached_at = MAP_FAILED;
jack_attach_port_segment (client, ptid);
}

@@ -911,7 +912,7 @@ jack_client_thread (void *arg)
jack_client_control_t *control = client->control;
jack_event_t event;
char status = 0;
char c;
char c = 0;
int err = 0;

pthread_mutex_lock (&client_lock);
@@ -969,7 +970,8 @@ jack_client_thread (void *arg)

pthread_testcancel();
if (client->graph_wait_fd >= 0 && (client->pollfd[WAIT_POLL_INDEX].revents & ~POLLIN)) {
if (client->graph_wait_fd >= 0 &&
(client->pollfd[WAIT_POLL_INDEX].revents & ~POLLIN)) {
DEBUG ("\n\n\n\n\n\n\n\nWAITFD ERROR, ZOMBIE\n\n\n\n\n");
@@ -1800,6 +1802,12 @@ jack_get_ports (jack_client_t *client,
matching_ports[match_cnt++] = psp[i].name;
}
}
if (port_name_pattern && port_name_pattern[0]) {
regfree (&port_regex);
}
if (type_name_pattern && type_name_pattern[0]) {
regfree (&type_regex);
}

matching_ports[match_cnt] = 0;



Loading…
Cancel
Save