[MPlayer-dev-eng] [PATCH 12/12] ao_alsa: remove mmap suboption

Clemens Ladisch cl at cl.domainfactory-kunde.de
Mon Feb 6 09:29:26 CET 2006


Remove the now superfluous mmap suboption.

Index: MPlayer-1.0pre7try2/libao2/ao_alsa.c
===================================================================
--- MPlayer-1.0pre7try2.orig/libao2/ao_alsa.c	2006-02-05 22:52:18.000000000 +0100
+++ MPlayer-1.0pre7try2/libao2/ao_alsa.c	2006-02-05 22:52:20.000000000 +0100
@@ -62,7 +62,6 @@ static snd_pcm_uframes_t chunk_size = 10
 
 static size_t bytes_per_sample;
 
-static int ao_mmap = 0;
 static int ao_noblock = 0;
 
 static int open_mode;
@@ -259,7 +258,6 @@ static int init(int rate_hz, int channel
     snd_pcm_uframes_t bufsize;
     snd_pcm_uframes_t boundary;
     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}
@@ -342,7 +340,6 @@ static int init(int rate_hz, int channel
     
     //subdevice parsing
     // set defaults
-    ao_mmap = 0;
     block = 1;
     /* switch for spdif
      * sets opening sequence for SPDIF
@@ -401,8 +398,6 @@ static int init(int rate_hz, int channel
         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-dev-eng mailing list