[Liboss-commit] CVS: liboss/lib liboss.c,1.7,1.8

[Justin <th...@us...>]

Update of /cvsroot/liboss/liboss/lib
In directory usw-pr-cvs1:/tmp/cvs-serv27309/lib

Modified Files:
	liboss.c 
Log Message:
Compiles now

Index: liboss.c
===================================================================
RCS file: /cvsroot/liboss/liboss/lib/liboss.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- liboss.c	10 May 2002 14:53:29 -0000	1.7
+++ liboss.c	5 Nov 2002 17:16:30 -0000	1.8
@@ -97,6 +97,7 @@
 static int initialized = 0;
 static pthread_t server;
 
+/*
 int
 oss_open(const char *path, int flags, mode_t mode)
 {
@@ -108,7 +109,7 @@
 	if (0 == strcmp("/dev/dspW", buf)) {
 		return oss_audio_open(flags);
 	} else {
-		/* FIXME: add mixer stuff */
+		// FIXME: add mixer stuff
 		return open(path, flags, mode);
 	}
 }
@@ -126,16 +127,16 @@
 
 static int
 oss_audio_open(int flags)
-{
-	/* FIXME:	Don't forget recording!
-				Set up format defaults.
-				setsockopt()
-				Close sockets (and alert Mac side) if they're open already.
-				Apparently you can't test if a socket is closed at the other end,
-					so we have to override close() too.
-				Account for multiple, different /dev/blahs (use a table).
-				Stop abusing clients.
-	*/
+{ 
+	 FIXME:	Don't forget recording!
+		Set up format defaults.
+		setsockopt()
+		Close sockets (and alert Mac side) if they're open already.
+		Apparently you can't test if a socket is closed at the other end,
+		so we have to override close() too.
+		Account for multiple, different /dev/blahs (use a table).
+		Stop abusing clients.
+	
 	int socks[2];
 	rw_e rw;
 	
@@ -145,7 +146,7 @@
 	}
 	
 	switch (flags & O_ACCMODE) {
-		case O_RDONLY:	rw = OSS_WRITE;	break; /* If they want to read, we must write */
+		case O_RDONLY:	rw = OSS_WRITE;	break; // If they want to read, we must write
 		case O_WRONLY:	rw = OSS_READ;	break;
 		case O_RDWR:	rw = OSS_RW;	break;
 		default:
@@ -175,7 +176,7 @@
 	
 	return socks[1];
 }
-
+*/
 static int
 oss_init(void)
 {
@@ -236,7 +237,7 @@
 static int
 oss_audio_ioctl(int fd, unsigned long com, void *argp)
 {
-	int retval = 0;
+	/* int retval = 0; */
 
 	/* FIXME: implement */
 	switch (com) {