diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-28 00:54:08 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-28 00:54:08 +0200 |
| commit | d84685ce13c7b31689b257e44b780373c91f8d32 (patch) | |
| tree | a16cf570b42d8aed52a42a385d7a27ee36551e98 /libao2/ao_alsa.c | |
| parent | 79ab199322a7070c489eca842e472d15be02412c (diff) | |
| parent | 9b6b3ff08c3f0c5151a379cabd08cfb0fa309f79 (diff) | |
| download | mpv-d84685ce13c7b31689b257e44b780373c91f8d32.tar.bz2 mpv-d84685ce13c7b31689b257e44b780373c91f8d32.tar.xz | |
Merge svn changes up to r30448
Diffstat (limited to 'libao2/ao_alsa.c')
| -rw-r--r-- | libao2/ao_alsa.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index 92b8b64ea7..49f4237604 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -77,10 +77,7 @@ static snd_pcm_sw_params_t *alsa_swparams; static size_t bytes_per_sample; -static int ao_noblock = 0; - -static int open_mode; -static int alsa_can_pause = 0; +static int alsa_can_pause; static snd_pcm_sframes_t prepause_frames; #define ALSA_DEVICE_SIZE 256 @@ -120,9 +117,9 @@ static int control(int cmd, void *arg) snd_mixer_elem_t *elem; snd_mixer_selem_id_t *sid; - static char *mix_name = "PCM"; - static char *card = "default"; - static int mix_index = 0; + char *mix_name = "PCM"; + char *card = "default"; + int mix_index = 0; long pmin, pmax; long get_vol, set_vol; @@ -478,25 +475,17 @@ static int init(int rate_hz, int channels, int format, int flags) 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) { - open_mode = SND_PCM_NONBLOCK; - } - else { - open_mode = 0; - } - if (!alsa_handler) { + int open_mode = block ? 0 : SND_PCM_NONBLOCK; int isac3 = AF_FORMAT_IS_AC3(format); //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_tmsg(MSGT_AO,MSGL_INFO,"[AO_ALSA] Open in nonblock-mode failed, trying to open in block-mode.\n"); if ((err = try_open_device(alsa_device, 0, isac3)) < 0) { mp_tmsg(MSGT_AO,MSGL_ERR,"[AO_ALSA] Playback open error: %s\n", snd_strerror(err)); |