[MPlayer-cvslog] CVS: main/libao2 ao_alsa.c,1.32,1.33

Clemens Ladisch CVS syncmail at mplayerhq.hu
Mon Feb 13 12:17:46 CET 2006


CVS change done by Clemens Ladisch CVS

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var2/tmp/cvs-serv18086/libao2

Modified Files:
	ao_alsa.c 
Log Message:
Remove the now superfluous mmap suboption.

Index: ao_alsa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_alsa.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ao_alsa.c	13 Feb 2006 11:16:29 -0000	1.32
+++ ao_alsa.c	13 Feb 2006 11:17:43 -0000	1.33
@@ -63,7 +63,6 @@
 static size_t bits_per_sample, bytes_per_sample, bits_per_frame;
 static size_t chunk_bytes;
 
-static int ao_mmap = 0;
 static int ao_noblock = 0;
 
 static int open_mode;
@@ -261,7 +260,6 @@
     strarg_t device;
     snd_pcm_uframes_t bufsize;
     opt_t subopts[] = {
-      {"mmap", OPT_ARG_BOOL, &ao_mmap, NULL},
       {"block", OPT_ARG_BOOL, &block, NULL},
       {"device", OPT_ARG_STR, &device, (opt_test_f)str_maxlen},
       {NULL}
@@ -345,7 +343,6 @@
     
     //subdevice parsing
     // set defaults
-    ao_mmap = 0;
     block = 1;
     /* switch for spdif
      * sets opening sequence for SPDIF
@@ -404,8 +401,6 @@
         print_help();
         return 0;
     }
-    if (ao_mmap)
-      mp_msg(MSGT_AO,MSGL_WARN,"alsa-init: mmap option is obsolete and has no effect");
     ao_noblock = !block;
     parse_device(alsa_device, device.str, device.len);
 




More information about the MPlayer-cvslog mailing list