[xiph-cvs] cvs commit: ao/src/plugins/irix Makefile.am

[Stan Seibert]

volsung     01/07/23 06:23:16

  Modified:    .        Tag: volsung_20010721 configure.in
               src/plugins/alsa Tag: volsung_20010721 ao_alsa.c
               src/plugins/irix Tag: volsung_20010721 Makefile.am
  Log:
  - Added header check to ALSA test in configure script
  - Fixed function naming problem in ALSA driver
  - Fixed variable name in IRIX driver Makefile

Revision  Changes    Path
No                   revision

No                   revision

1.21.2.3  +1 -0      ao/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ao/configure.in,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -r1.21.2.2 -r1.21.2.3
--- configure.in	2001/07/22 13:16:13	1.21.2.2
+++ configure.in	2001/07/23 13:23:15	1.21.2.3
@@ -141,6 +141,7 @@
 
 if test "$BUILD_ALSA" = "yes"; then
    AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
+   AC_CHECK_HEADER(sys/asoundlib.h, , have_alsa=no)
    AM_CONDITIONAL(HAVE_ALSA,test "x$have_alsa" = xyes)
 fi
 

No                   revision

No                   revision

1.5.2.2   +2 -2      ao/src/plugins/alsa/ao_alsa.c

Index: ao_alsa.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/alsa/ao_alsa.c,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- ao_alsa.c	2001/07/22 03:35:50	1.5.2.1
+++ ao_alsa.c	2001/07/23 13:23:15	1.5.2.2
@@ -252,7 +252,7 @@
                 internal->buf_end += copy_len;
 
                 if(internal->buf_end == internal->buf_size)
-			ok = ao_alsa_write_buffer(internal);
+			ok = _alsa_write_buffer(internal);
         }
 
         return ok;
@@ -265,7 +265,7 @@
         int result;
 
         /* Clear buffer */
-	result = _ao_alsa_write_buffer(internal);
+	result = _alsa_write_buffer(internal);
         snd_pcm_close(internal->pcm_handle);
         free(internal->buf);
 

No                   revision

No                   revision

1.1.2.2   +1 -1      ao/src/plugins/irix/Attic/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/irix/Attic/Makefile.am,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Makefile.am	2001/07/22 03:35:52	1.1.2.1
+++ Makefile.am	2001/07/23 13:23:16	1.1.2.2
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-if HAVE_IRIX_AUDIO
+if HAVE_IRIX
 
 irixltlibs = libirix.la
 irixldflags = -export-dynamic -avoid-version

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.