Update of /cvsroot/alsa/alsa-oss/oss-redir
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16922/oss-redir
Modified Files:
Makefile.am oss-redir.c oss-redir.h
Log Message:
- fixed oss wrapper mixer open bug (missing code)
- added lmixer to test directory
- ported mmap_test to use oss redirector
- don't compile code != libalsatoss with -lasound
Index: Makefile.am
===================================================================
RCS file: /cvsroot/alsa/alsa-oss/oss-redir/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 9 Feb 2004 12:36:39 -0000 1.1
+++ Makefile.am 12 Feb 2004 17:16:07 -0000 1.2
@@ -1,4 +1,4 @@
-ossredirincludedir = ${includedir}
+ossredirincludedir = ${includedir}/sound
ossredirinclude_HEADERS = oss-redir.h
Index: oss-redir.c
===================================================================
RCS file: /cvsroot/alsa/alsa-oss/oss-redir/oss-redir.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oss-redir.c 10 Feb 2004 13:39:55 -0000 1.4
+++ oss-redir.c 12 Feb 2004 17:16:07 -0000 1.5
@@ -44,6 +44,7 @@
static int (*x_oss_pcm_open)(const char *pathname, int flags);
static int (*x_oss_pcm_close)(int fd);
+int (*oss_pcm_nonblock)(int fd, int nonblock);
ssize_t (*oss_pcm_read)(int fd, void *buf, size_t count);
ssize_t (*oss_pcm_write)(int fd, const void *buf, size_t count);
void * (*oss_pcm_mmap)(void *start, size_t length, int prot, int flags, int fd, off_t
offset);
Index: oss-redir.h
===================================================================
RCS file: /cvsroot/alsa/alsa-oss/oss-redir/oss-redir.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oss-redir.h 10 Feb 2004 13:39:55 -0000 1.4
+++ oss-redir.h 12 Feb 2004 17:16:07 -0000 1.5
@@ -29,6 +29,10 @@
#define OSS_WAIT_EVENT_WRITE (1<<1)
#define OSS_WAIT_EVENT_ERROR (1<<2)
+#ifdef __cplusplus
+extern "C" {
+#endif
+
extern int oss_pcm_open(const char *pathname, int flags, ...);
extern int oss_pcm_close(int fd);
extern int (*oss_pcm_nonblock)(int fd, int nonblock);
@@ -47,5 +51,8 @@
extern int oss_mixer_close(int fd);
extern int (*oss_mixer_ioctl)(int fd, unsigned long int request, ...);
+#ifdef __cplusplus
+}
+#endif
#endif /* __OSS_REDIR_H */
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
