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.

diff --git a/Makefile.am b/Makefile.am
index fdded95908897e7b4383b252eb05807dbdce2ec0..522013b9263d36ca3a7c11eab3b05b5781c6b188 100644 (file)
--- 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 73d112bf82427c0936e3dab1b32b647c1dad7b5d..7720d43a5904436950ccc9342f9ffd8a9b8690fe 100644 (file)
--- 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 97a4bc23d722c148240356a889147ceaaa1bd731..c1f05705bafde91f2a16406b1a25d5a06807e31c 100644 (file)
--- 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 (file)
index 0000000..98eda37
--- /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 (file)
index 0000000..9f5917f
--- /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 7ec5fe86ff269d47aaf49ce96b316bfb2f22fe40..54d6bd961cec1fd19b1828f40d8cf3e288070d9b 100644 (file)
--- 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 cc15331f28b7f03958e684be07f484aacb64c68d..bb466ed773858512a7d33238757c019ad52a3cf5 100644 (file)
--- 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