diff options
| author | wm4 <wm4@nowhere> | 2012-11-01 01:41:14 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-01 02:12:18 +0100 |
| commit | e45dd051c304dec189d0d4d792a89c2988c3fa71 (patch) | |
| tree | c6b9b87449b3985767ddcf256bedf9012f25ec2f /libao2/ao_alsa.c | |
| parent | 741ab3951097af079ca36796ff9dc7ef95496701 (diff) | |
| download | mpv-e45dd051c304dec189d0d4d792a89c2988c3fa71.tar.bz2 mpv-e45dd051c304dec189d0d4d792a89c2988c3fa71.tar.xz | |
ao_alsa: make code less confusing
The call snd_pcm_hw_params_alloca(&alsa_hwparams) expands to a macro,
which actually uses alloca(), and stores its result to alsa_hwparams.
At the same time, alsa_hwparams was a global variable for no good
reason. Make it less confusing and move the variables into the init()
function, where they are needed.
Diffstat (limited to 'libao2/ao_alsa.c')
| -rw-r--r-- | libao2/ao_alsa.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index e0322c70d5..27119112cb 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -61,8 +61,6 @@ LIBAO_EXTERN(alsa) static snd_pcm_t *alsa_handler; static snd_pcm_format_t alsa_format; -static snd_pcm_hw_params_t *alsa_hwparams; -static snd_pcm_sw_params_t *alsa_swparams; #define BUFFER_TIME 500000 // 0.5 s #define FRAGCOUNT 16 @@ -487,6 +485,8 @@ static int init(int rate_hz, int channels, int format, int flags) mp_msg(MSGT_AO,MSGL_V,"alsa-init: using device %s\n", alsa_device); + alsa_can_pause = 1; + if (!alsa_handler) { int open_mode = block ? 0 : SND_PCM_NONBLOCK; int isac3 = AF_FORMAT_IS_AC3(format) || AF_FORMAT_IS_IEC61937(format); @@ -511,6 +511,9 @@ static int init(int rate_hz, int channels, int format, int flags) mp_msg(MSGT_AO,MSGL_V,"alsa-init: pcm opened in blocking mode\n"); } + snd_pcm_hw_params_t *alsa_hwparams; + snd_pcm_sw_params_t *alsa_swparams; + snd_pcm_hw_params_alloca(&alsa_hwparams); snd_pcm_sw_params_alloca(&alsa_swparams); @@ -665,12 +668,13 @@ static int init(int rate_hz, int channels, int format, int flags) } /* end setting sw-params */ + alsa_can_pause = snd_pcm_hw_params_can_pause(alsa_hwparams); + mp_msg(MSGT_AO,MSGL_V,"alsa: %d Hz/%d channels/%d bpf/%d bytes buffer/%s\n", ao_data.samplerate, ao_data.channels, (int)bytes_per_sample, ao_data.buffersize, snd_pcm_format_description(alsa_format)); } // end switch alsa_handler (spdif) - alsa_can_pause = snd_pcm_hw_params_can_pause(alsa_hwparams); return 1; } // end init |