mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	refuse to initialize on modem devices
This commit is contained in:
		
							parent
							
								
									f7083280f8
								
							
						
					
					
						commit
						77a1e3876b
					
				
					 4 changed files with 24 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -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_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)
 | 
			
		||||
        pa_log_info("Selected configuration '%s' (%s).", profile->description, profile->name);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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_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)
 | 
			
		||||
        pa_log_info("Selected configuration '%s' (%s).", profile->description, profile->name);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1769,3 +1769,15 @@ pa_bool_t pa_alsa_pcm_is_hw(snd_pcm_t *pcm) {
 | 
			
		|||
 | 
			
		||||
    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;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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_modem(snd_pcm_t *pcm);
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue