Mercurial > mplayer.hg

changeset 30398:acb92f578a08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author reimar
date Wed, 27 Jan 2010 18:10:07 +0000
parents 3e858991e23d
children d280f1bbfe93
files libao2/ao_alsa.c
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libao2/ao_alsa.c	Wed Jan 27 00:25:23 2010 +0000
+++ b/libao2/ao_alsa.c	Wed Jan 27 18:10:07 2010 +0000
@@ -72,14 +72,10 @@
 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 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;