Mercurial > mplayer.hg

changeset 30401:a97f9a9f30d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove a useless global variable.
author reimar
date Wed, 27 Jan 2010 18:21:27 +0000
parents 88fd2aa823e5
children 9fc779fd3721
files libao2/ao_alsa.c
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libao2/ao_alsa.c	Wed Jan 27 18:16:41 2010 +0000
+++ b/libao2/ao_alsa.c	Wed Jan 27 18:21:27 2010 +0000
@@ -74,8 +74,6 @@
 
 static size_t bytes_per_sample;
 
-static int ao_noblock;
-
 static int alsa_can_pause;
 
 #define ALSA_DEVICE_SIZE 256
@@ -467,13 +465,12 @@
         print_help();
         return 0;
     }
-    ao_noblock = !block;
     parse_device(alsa_device, device.str, device.len);
 
     mp_msg(MSGT_AO,MSGL_V,"alsa-init: using device %s\n", alsa_device);
 
     //setting modes for block or nonblock-mode
-    if (ao_noblock) {
+    if (!block) {
       open_mode = SND_PCM_NONBLOCK;
     }
     else {
@@ -485,7 +482,7 @@
       //modes = 0, SND_PCM_NONBLOCK, SND_PCM_ASYNC
       if ((err = try_open_device(alsa_device, open_mode, isac3)) < 0)
 	{
-	  if (err != -EBUSY && ao_noblock) {
+	  if (err != -EBUSY && !block) {
 	    mp_msg(MSGT_AO,MSGL_INFO,MSGTR_AO_ALSA_OpenInNonblockModeFailed);
 	    if ((err = try_open_device(alsa_device, 0, isac3)) < 0) {
 	      mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_PlaybackOpenError, snd_strerror(err));