ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue snd_pcm_start() when capturing audio 

snd_pcm_start() starts the capture process and ensures that the events
are delivered to the poll handler. Without the call, capture can be started
only when there is simultaneous playback running.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: malc <av1474@comtv.ru>
This commit is contained in:
Jindrich Makovicka 2010-10-17 20:17:19 +02:00 committed by malc
parent 22d948a2d9
commit 38cc9b607f
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
audio/alsaaudio.c
View File

@ -843,11 +843,15 @@ static int alsa_init_out (HWVoiceOut *hw, struct audsettings *as)
return 0; return 0;
} }
static int alsa_voice_ctl (snd_pcm_t *handle, const char *typ, int pause) #define VOICE_CTL_PAUSE 0
#define VOICE_CTL_PREPARE 1
#define VOICE_CTL_START 2
static int alsa_voice_ctl (snd_pcm_t *handle, const char *typ, int ctl)
{ {
int err; int err;
if (pause) { if (ctl == VOICE_CTL_PAUSE) {
err = snd_pcm_drop (handle); err = snd_pcm_drop (handle);
if (err < 0) { if (err < 0) {
alsa_logerr (err, "Could not stop %s\n", typ); alsa_logerr (err, "Could not stop %s\n", typ);
@ -860,6 +864,13 @@ static int alsa_voice_ctl (snd_pcm_t *handle, const char *typ, int pause)
alsa_logerr (err, "Could not prepare handle for %s\n", typ); alsa_logerr (err, "Could not prepare handle for %s\n", typ);
return -1; return -1;
} }
if (ctl == VOICE_CTL_START) {
err = snd_pcm_start(handle);
if (err < 0) {
alsa_logerr (err, "Could not start handle for %s\n", typ);
return -1;
}
}
} }
return 0; return 0;
@ -884,7 +895,7 @@ static int alsa_ctl_out (HWVoiceOut *hw, int cmd, ...)
poll_mode = 0; poll_mode = 0;
} }
hw->poll_mode = poll_mode; hw->poll_mode = poll_mode;
return alsa_voice_ctl (alsa->handle, "playback", 0); return alsa_voice_ctl (alsa->handle, "playback", VOICE_CTL_PREPARE);
} }
case VOICE_DISABLE: case VOICE_DISABLE:
@ -893,7 +904,7 @@ static int alsa_ctl_out (HWVoiceOut *hw, int cmd, ...)
hw->poll_mode = 0; hw->poll_mode = 0;
alsa_fini_poll (&alsa->pollhlp); alsa_fini_poll (&alsa->pollhlp);
} }
return alsa_voice_ctl (alsa->handle, "playback", 1); return alsa_voice_ctl (alsa->handle, "playback", VOICE_CTL_PAUSE);
} }
return -1; return -1;
@ -1106,7 +1117,7 @@ static int alsa_ctl_in (HWVoiceIn *hw, int cmd, ...)
} }
hw->poll_mode = poll_mode; hw->poll_mode = poll_mode;
return alsa_voice_ctl (alsa->handle, "capture", 0); return alsa_voice_ctl (alsa->handle, "capture", VOICE_CTL_START);
} }
case VOICE_DISABLE: case VOICE_DISABLE:
@ -1115,7 +1126,7 @@ static int alsa_ctl_in (HWVoiceIn *hw, int cmd, ...)
hw->poll_mode = 0; hw->poll_mode = 0;
alsa_fini_poll (&alsa->pollhlp); alsa_fini_poll (&alsa->pollhlp);
} }
return alsa_voice_ctl (alsa->handle, "capture", 1); return alsa_voice_ctl (alsa->handle, "capture", VOICE_CTL_PAUSE);
} }
return -1; return -1;