[xiph-cvs] cvs commit: ao/src audio_out.c

[Chris Wolf]

cwolf       01/09/05 12:34:29

  Modified:    src      audio_out.c
  Log:
  Don't include unistd.h with MSVC, fix a warning

Revision  Changes    Path
1.20      +6 -20     ao/src/audio_out.c

Index: audio_out.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/audio_out.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- audio_out.c	2001/08/31 23:17:55	1.19
+++ audio_out.c	2001/09/05 19:34:29	1.20
@@ -30,14 +30,17 @@
 #include <dlfcn.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#ifndef _MSC_VER
+# include <unistd.h>
+#endif
 #include <dirent.h>
+
 #include "ao/ao.h"
 #include "ao_private.h"
 
 /* These should have been set by the Makefile */
 #ifndef AO_PLUGIN_PATH
-#define AO_PLUGIN_PATH "/usr/local/lib/ao/plugins"
+#define AO_PLUGIN_PATH "/usr/local/lib/ao"
 #endif
 #ifndef SHARED_LIB_EXT
 #define SHARED_LIB_EXT ".so"
@@ -137,11 +140,6 @@
                   dlsym(dt->handle, "ao_plugin_device_clear");
                 if (dlerror()) { free(dt->functions); free(dt); return NULL; }
 
-		/* Optional function */
-		dt->functions->file_extension = 
-		  dlsym(dt->handle, "ao_plugin_file_extension");
-		if (dlerror()) { dt->functions->file_extension = NULL; }
-
 
         } else {
                 return NULL;
@@ -394,7 +392,7 @@
    the target buffer. */
 void _swap_samples(char *target_buffer, char* source_buffer, uint_32 num_bytes)
 {
-	int i;
+	uint_32 i;
 
         for (i = 0; i < num_bytes; i += 2) {
                 target_buffer[i] = source_buffer[i+1];
@@ -701,18 +699,6 @@
         *count = driver_count;
         return info_table;
 }
-
-
-char *ao_file_extension(int driver_id)
-{
-	driver_list *driver;
-
-	if ( (driver = _get_driver(driver_id)) 
-	     && driver->functions->file_extension != NULL)
-		return driver->functions->file_extension();
-	else
-		return NULL;
-}  
 
 
 /* -- Miscellaneous -- */

--- >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.