New mixer API updates for testing (compatibility mode)amixer

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

5 files changed, 27 insertions, 16 deletions

diff --git a/alsamixer/alsamixer.c b/alsamixer/alsamixer.c
index c65c22d..edb5e91 100644
--- a/alsamixer/alsamixer.c
+++ b/alsamixer/alsamixer.c
@@ -124,6 +124,7 @@
 #include <time.h>
 
 #include <alsa/asoundlib.h>
+#include <alsa/mixer_old.h>
 #include "aconfig.h"
 
 /* example compilation commandline:
diff --git a/alsamixer/go b/alsamixer/go
index c33c298..2c2c1df 100755
--- a/alsamixer/go
+++ b/alsamixer/go
@@ -1,10 +1,3 @@
 #!/bin/bash
 
-#GDB="gdb --args"
-GDB=""
-
-ALSA_MIXER_SIMPLE_MODULES="$HOME/hg/alsa-lib/modules/mixer/simple/.libs" \
-ALSA_MIXER_SIMPLE="$HOME/hg/alsa-lib/src/conf/smixer.conf" \
-ALSA_MIXER_SIMPLE_MPYTHON="$HOME/hg/alsa-lib/modules/mixer/simple/python/main.py" \
-LD_PRELOAD="$HOME/hg/alsa-lib/src/.libs/libasound.so" \
-$GDB ./alsamixer "$@"
+../go run ./alsamixer "$@"
diff --git a/amixer/amixer.c b/amixer/amixer.c
index 9620721..4dc3863 100644
--- a/amixer/amixer.c
+++ b/amixer/amixer.c
@@ -28,6 +28,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <alsa/asoundlib.h>
+#include <alsa/mixer_old.h>
 #include <sys/poll.h>
 #include "amixer.h"
 
diff --git a/amixer/go b/amixer/go
index 071627f..3e1d13d 100755
--- a/amixer/go
+++ b/amixer/go
@@ -1,10 +1,3 @@
 #!/bin/bash
 
-#GDB="gdb --args"
-GDB=""
-
-ALSA_MIXER_SIMPLE_MODULES="$HOME/hg/alsa-lib/modules/mixer/simple/.libs" \
-ALSA_MIXER_SIMPLE="$HOME/hg/alsa-lib/src/conf/smixer.conf" \
-ALSA_MIXER_SIMPLE_MPYTHON="$HOME/hg/alsa-lib/modules/mixer/simple/python/main.py" \
-LD_PRELOAD="$HOME/hg/alsa-lib/src/.libs/libasound.so" \
-$GDB ./amixer "$@"
+../go run ./amixer "$@"
diff --git a/go b/go
new file mode 100755
index 0000000..13ee43a
--- /dev/null
+++ b/go
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+GDB=""
+#GDB="gdb --args"
+BASEDIR=`pwd`/..
+[ ! -d $BASEDIR/alsa-lib ] && BASEDIR="$BASEDIR/.."
+CMD="$1"
+shift
+ALSALIB_CONF=$BASEDIR/alsa-lib/src/conf/alsa.conf
+
+case $CMD in
+run)
+  PROG="$1"
+  shift
+  ALSA_CONFIG_PATH="$ALSALIB_CONF" \
+    LD_PRELOAD=$BASEDIR/alsa-lib/src/.libs/libasound.so $GDB $PROG "$@"
+  ;;
+*)
+  echo "This is test build using alsa-lib in: $BASEDIR"
+  ./gitcompile --with-alsa-inc-prefix=$BASEDIR/alsa-lib/include \
+	       --with-alsa-prefix=$BASEDIR/alsa-lib/src/.libs
+  ;;
+esac