From a33c78ddd8c16fde85b1b3f7b3b3661238125e96 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 22 Aug 2005 12:07:55 +0000 Subject: [PATCH] moved simple mixer abstraction modules to modules/mixer/simple directory Compile dynamic modules outside the alsa-lib tree to allow linking them against libasound.so - proper versions of dynamic symbols. --- Makefile.am | 2 +- configure.in | 3 ++- include/mixer_abst.h | 2 ++ modules/Makefile.am | 1 + modules/mixer/Makefile.am | 1 + {src => modules}/mixer/simple/Makefile.am | 3 +++ {src => modules}/mixer/simple/ac97.c | 0 {src => modules}/mixer/simple/hda.c | 0 {src => modules}/mixer/simple/sbase.c | 0 {src => modules}/mixer/simple/sbase.h | 0 {src => modules}/mixer/simple/sbasedl.c | 0 src/mixer/Makefile.am | 2 -- 12 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 modules/Makefile.am create mode 100644 modules/mixer/Makefile.am rename {src => modules}/mixer/simple/Makefile.am (74%) rename {src => modules}/mixer/simple/ac97.c (100%) rename {src => modules}/mixer/simple/hda.c (100%) rename {src => modules}/mixer/simple/sbase.c (100%) rename {src => modules}/mixer/simple/sbase.h (100%) rename {src => modules}/mixer/simple/sbasedl.c (100%) diff --git a/Makefile.am b/Makefile.am index fdded959..522013b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS=doc include src aserver alsalisp test utils +SUBDIRS=doc include src modules aserver alsalisp test utils EXTRA_DIST=ChangeLog INSTALL TODO NOTES configure cvscompile libtool depcomp version MEMORY-LEAK AUTOMAKE_OPTIONS=foreign diff --git a/configure.in b/configure.in index 73d112bf..7720d43a 100644 --- a/configure.in +++ b/configure.in @@ -202,12 +202,13 @@ fi AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile include/Makefile include/sound/Makefile src/Makefile \ - src/control/Makefile src/mixer/Makefile src/mixer/simple/Makefile \ + src/control/Makefile src/mixer/Makefile \ src/pcm/Makefile src/pcm/scopes/Makefile \ src/rawmidi/Makefile src/timer/Makefile \ src/hwdep/Makefile src/seq/Makefile src/instr/Makefile \ src/compat/Makefile src/alisp/Makefile src/conf/Makefile \ src/conf/cards/Makefile \ src/conf/pcm/Makefile \ + modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \ alsalisp/Makefile aserver/Makefile test/Makefile utils/Makefile \ utils/alsa-lib.spec utils/alsa.pc) diff --git a/include/mixer_abst.h b/include/mixer_abst.h index 97a4bc23..c1f05705 100644 --- a/include/mixer_abst.h +++ b/include/mixer_abst.h @@ -96,6 +96,8 @@ int snd_mixer_selem_compare(const snd_mixer_elem_t *c1, const snd_mixer_elem_t * int snd_mixer_sbasic_info(const snd_mixer_class_t *class, sm_class_basic_t *info); void *snd_mixer_sbasic_get_private(const snd_mixer_class_t *class); +void snd_mixer_sbasic_set_private(const snd_mixer_class_t *class, void *private_data); +void snd_mixer_sbasic_set_private_free(const snd_mixer_class_t *class, void (*private_free)(snd_mixer_class_t *class)); /** \} */ diff --git a/modules/Makefile.am b/modules/Makefile.am new file mode 100644 index 00000000..98eda37c --- /dev/null +++ b/modules/Makefile.am @@ -0,0 +1 @@ +SUBDIRS=mixer diff --git a/modules/mixer/Makefile.am b/modules/mixer/Makefile.am new file mode 100644 index 00000000..9f5917fe --- /dev/null +++ b/modules/mixer/Makefile.am @@ -0,0 +1 @@ +SUBDIRS=simple diff --git a/src/mixer/simple/Makefile.am b/modules/mixer/simple/Makefile.am similarity index 74% rename from src/mixer/simple/Makefile.am rename to modules/mixer/simple/Makefile.am index 7ec5fe86..54d6bd96 100644 --- a/src/mixer/simple/Makefile.am +++ b/modules/mixer/simple/Makefile.am @@ -10,9 +10,12 @@ noinst_HEADERS = sbase.h smixer_sbase_la_SOURCES = sbase.c smixer_sbase_la_LDFLAGS = -module -avoid-version +smixer_sbase_la_LIBADD = ../../../src/libasound.la smixer_ac97_la_SOURCES = ac97.c sbasedl.c smixer_ac97_la_LDFLAGS = -module -avoid-version +smixer_ac97_la_LIBADD = ../../../src/libasound.la smixer_hda_la_SOURCES = hda.c sbasedl.c smixer_hda_la_LDFLAGS = -module -avoid-version +smixer_hda_la_LIBADD = ../../../src/libasound.la diff --git a/src/mixer/simple/ac97.c b/modules/mixer/simple/ac97.c similarity index 100% rename from src/mixer/simple/ac97.c rename to modules/mixer/simple/ac97.c diff --git a/src/mixer/simple/hda.c b/modules/mixer/simple/hda.c similarity index 100% rename from src/mixer/simple/hda.c rename to modules/mixer/simple/hda.c diff --git a/src/mixer/simple/sbase.c b/modules/mixer/simple/sbase.c similarity index 100% rename from src/mixer/simple/sbase.c rename to modules/mixer/simple/sbase.c diff --git a/src/mixer/simple/sbase.h b/modules/mixer/simple/sbase.h similarity index 100% rename from src/mixer/simple/sbase.h rename to modules/mixer/simple/sbase.h diff --git a/src/mixer/simple/sbasedl.c b/modules/mixer/simple/sbasedl.c similarity index 100% rename from src/mixer/simple/sbasedl.c rename to modules/mixer/simple/sbasedl.c diff --git a/src/mixer/Makefile.am b/src/mixer/Makefile.am index cc15331f..bb466ed7 100644 --- a/src/mixer/Makefile.am +++ b/src/mixer/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS=simple - EXTRA_LTLIBRARIES=libmixer.la libmixer_la_SOURCES = bag.c mixer.c simple.c simple_none.c simple_abst.c -- 2.47.1