refuse to initialize on modem devices

This commit is contained in:
Lennart Poettering 2009-04-04 04:12:42 +02:00
parent f7083280f8
commit 77a1e3876b
4 changed files with 24 additions and 0 deletions

View file

@ -1617,6 +1617,11 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
pa_assert(u->device_name); pa_assert(u->device_name);
pa_log_info("Successfully opened device %s.", u->device_name); pa_log_info("Successfully opened device %s.", u->device_name);
if (pa_alsa_pcm_is_modem(u->pcm_handle)) {
pa_log_notice("Device %s is modem, refusing further initialization.", u->device_name);
goto fail;
}
if (profile) if (profile)
pa_log_info("Selected configuration '%s' (%s).", profile->description, profile->name); pa_log_info("Selected configuration '%s' (%s).", profile->description, profile->name);

View file

@ -1469,6 +1469,11 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
pa_assert(u->device_name); pa_assert(u->device_name);
pa_log_info("Successfully opened device %s.", u->device_name); pa_log_info("Successfully opened device %s.", u->device_name);
if (pa_alsa_pcm_is_modem(u->pcm_handle)) {
pa_log_notice("Device %s is modem, refusing further initialization.", u->device_name);
goto fail;
}
if (profile) if (profile)
pa_log_info("Selected configuration '%s' (%s).", profile->description, profile->name); pa_log_info("Selected configuration '%s' (%s).", profile->description, profile->name);

View file

@ -1769,3 +1769,15 @@ pa_bool_t pa_alsa_pcm_is_hw(snd_pcm_t *pcm) {
return snd_pcm_info_get_card(info) >= 0; return snd_pcm_info_get_card(info) >= 0;
} }
pa_bool_t pa_alsa_pcm_is_modem(snd_pcm_t *pcm) {
snd_pcm_info_t* info;
snd_pcm_info_alloca(&info);
pa_assert(pcm);
if (snd_pcm_info(pcm, info) < 0)
return FALSE;
return snd_pcm_info_get_class(info) == SND_PCM_CLASS_MODEM;
}

View file

@ -141,4 +141,6 @@ char *pa_alsa_get_reserve_name(const char *device);
pa_bool_t pa_alsa_pcm_is_hw(snd_pcm_t *pcm); pa_bool_t pa_alsa_pcm_is_hw(snd_pcm_t *pcm);
pa_bool_t pa_alsa_pcm_is_modem(snd_pcm_t *pcm);
#endif #endif