[MPlayer-cvslog] r30440 - trunk/libao2/ao_alsa.c

[reimar]

Author: reimar
Date: Wed Jan 27 19:10:07 2010
New Revision: 30440

Log:
Do not needlessly use (file-)global variables.
Since they also were initialized to a value and non-constant (changed
by ALSA) this might actually have caused bugs.

Modified:
   trunk/libao2/ao_alsa.c

Modified: trunk/libao2/ao_alsa.c
==============================================================================
--- trunk/libao2/ao_alsa.c	Wed Jan 27 01:25:23 2010	(r30439)
+++ trunk/libao2/ao_alsa.c	Wed Jan 27 19:10:07 2010	(r30440)
@@ -72,14 +72,10 @@ static snd_pcm_format_t alsa_format;
 static snd_pcm_hw_params_t *alsa_hwparams;
 static snd_pcm_sw_params_t *alsa_swparams;
 
-static unsigned int alsa_buffer_time = 500000; /* 0.5 s */
-static unsigned int alsa_fragcount = 16;
-
 static size_t bytes_per_sample;
 
 static int ao_noblock = 0;
 
-static int open_mode;
 static int alsa_can_pause = 0;
 
 #define ALSA_DEVICE_SIZE 256
@@ -319,6 +315,9 @@ static int try_open_device(const char *d
 */
 static int init(int rate_hz, int channels, int format, int flags)
 {
+    unsigned int alsa_buffer_time = 500000; /* 0.5 s */
+    unsigned int alsa_fragcount = 16;
+    int open_mode;
     int err;
     int block;
     strarg_t device;