mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-12-16 08:56:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

More pcm_jack plugin changes

Browse source
This commit is contained in:
Jaroslav Kysela 2003-02-12 21:57:49 +00:00
parent 88bc5d454e
commit 62546a3a32
7 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
aserver/Makefile.am
View file

@ -1,8 +1,13 @@
if HAVE_JACK
JACK_LIB = -ljack
else
JACK_LIB =
endif
bin_PROGRAMS = aserver bin_PROGRAMS = aserver
aserver_SOURCES = aserver.c aserver_SOURCES = aserver.c
# aserver_LDADD = -lasound # aserver_LDADD = -lasound
aserver_LDADD = ../src/libasound.la aserver_LDADD = ../src/libasound.la $(JACK_LIB)
all: aserver all: aserver

13
configure.in
View file

@ -118,6 +118,19 @@ else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
dnl Check for jack...
AC_MSG_CHECKING(for jack)
AC_ARG_WITH(jack,
[ --with-jack do you have installed Jack Audio Connection Kit (optional)],
[ AC_DEFINE(HAVE_JACK, "1", [enabled])
jack=yes ],)
if test "$jack" = "yes" ; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
AM_CONDITIONAL(HAVE_JACK, test x$jack = xyes)
dnl Check for architecture dnl Check for architecture
AC_MSG_CHECKING(for architecture) AC_MSG_CHECKING(for architecture)
case "$target" in case "$target" in

4
include/pcm.h
View file

@ -347,7 +347,9 @@ enum _snd_pcm_type {
/** LADSPA integration plugin */ /** LADSPA integration plugin */
SND_PCM_TYPE_LADSPA, SND_PCM_TYPE_LADSPA,
/** Direct Mixing plugin */ /** Direct Mixing plugin */
SND_PCM_TYPE_DMIX SND_PCM_TYPE_DMIX,
/** Jack Audio Connection Kit plugin */
SND_PCM_TYPE_JACK,
}; };
/** PCM type */ /** PCM type */

10
include/pcm_plugin.h
View file

@ -183,6 +183,16 @@ int _snd_pcm_ladspa_open(snd_pcm_t **pcmp, const char *name,
snd_config_t *root, snd_config_t *conf, snd_config_t *root, snd_config_t *conf,
snd_pcm_stream_t stream, int mode); snd_pcm_stream_t stream, int mode);
/*
* Jack plugin
*/
int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name,
snd_pcm_stream_t stream, int mode);
int _snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name,
snd_config_t *root, snd_config_t *conf,
snd_pcm_stream_t stream, int mode);
/** \} */ /** \} */
#endif /* __ALSA_PCM_PLUGIN_H */ #endif /* __ALSA_PCM_PLUGIN_H */

8
src/Makefile.am
View file

@ -2,12 +2,18 @@ SUBDIRS=control mixer pcm rawmidi timer hwdep seq instr compat conf
EXTRA_DIST=Versions EXTRA_DIST=Versions
COMPATNUM=@LIBTOOL_VERSION_INFO@ COMPATNUM=@LIBTOOL_VERSION_INFO@
if HAVE_JACK
JACK_LIB = -ljack
else
JACK_LIB =
endif
lib_LTLIBRARIES = libasound.la lib_LTLIBRARIES = libasound.la
libasound_la_SOURCES = conf.c confmisc.c input.c output.c async.c error.c dlmisc.c libasound_la_SOURCES = conf.c confmisc.c input.c output.c async.c error.c dlmisc.c
libasound_la_LIBADD = control/libcontrol.la mixer/libmixer.la pcm/libpcm.la \ libasound_la_LIBADD = control/libcontrol.la mixer/libmixer.la pcm/libpcm.la \
rawmidi/librawmidi.la timer/libtimer.la \ rawmidi/librawmidi.la timer/libtimer.la \
hwdep/libhwdep.la seq/libseq.la instr/libinstr.la \ hwdep/libhwdep.la seq/libseq.la instr/libinstr.la \
compat/libcompat.la -lm -ldl -lpthread compat/libcompat.la -lm -ldl -lpthread $(JACK_LIB)
libasound_la_LDFLAGS = -version-info $(COMPATNUM) libasound_la_LDFLAGS = -version-info $(COMPATNUM)
LDFLAGS = -Wl,--version-script=Versions LDFLAGS = -Wl,--version-script=Versions

2
src/control/control.c
View file

@ -512,7 +512,7 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name,
#ifndef PIC #ifndef PIC
extern void *snd_control_open_symbols(void); extern void *snd_control_open_symbols(void);
#endif #endif
void *h; void *h = NULL;
if (snd_config_get_type(ctl_conf) != SND_CONFIG_TYPE_COMPOUND) { if (snd_config_get_type(ctl_conf) != SND_CONFIG_TYPE_COMPOUND) {
if (name) if (name)
SNDERR("Invalid type for CTL %s definition", name); SNDERR("Invalid type for CTL %s definition", name);

2
src/pcm/pcm_plug.c
View file

@ -627,9 +627,9 @@ static int snd_pcm_plug_hw_refine_cprepare(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_
static int snd_pcm_plug_hw_refine_sprepare(snd_pcm_t *pcm, snd_pcm_hw_params_t *sparams) static int snd_pcm_plug_hw_refine_sprepare(snd_pcm_t *pcm, snd_pcm_hw_params_t *sparams)
{ {
snd_pcm_plug_t *plug = pcm->private_data; snd_pcm_plug_t *plug = pcm->private_data;
_snd_pcm_hw_params_any(sparams);
int err; int err;
_snd_pcm_hw_params_any(sparams);
if (plug->sformat >= 0) { if (plug->sformat >= 0) {
_snd_pcm_hw_params_set_format(sparams, plug->sformat); _snd_pcm_hw_params_set_format(sparams, plug->sformat);
_snd_pcm_hw_params_set_subformat(sparams, SND_PCM_SUBFORMAT_STD); _snd_pcm_hw_params_set_subformat(sparams, SND_PCM_SUBFORMAT_STD);