mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	alsa: properly treat ESTRPIPE as system suspend
This commit is contained in:
		
							parent
							
								
									3e2ab9b22e
								
							
						
					
					
						commit
						9b2534b6d0
					
				
					 2 changed files with 5 additions and 2 deletions
				
			
		| 
						 | 
					@ -340,8 +340,8 @@ static int try_recover(struct userdata *u, const char *call, int err) {
 | 
				
			||||||
    if (err == -EPIPE)
 | 
					    if (err == -EPIPE)
 | 
				
			||||||
        pa_log_debug("%s: Buffer underrun!", call);
 | 
					        pa_log_debug("%s: Buffer underrun!", call);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (err == -EBADFD)
 | 
					    if (err == -ESTRPIPE)
 | 
				
			||||||
        pa_log_debug("%s: Stream suspended!", call);
 | 
					        pa_log_debug("%s: System suspended!", call);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) < 0) {
 | 
					    if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) < 0) {
 | 
				
			||||||
        pa_log("%s: %s", call, pa_alsa_strerror(err));
 | 
					        pa_log("%s: %s", call, pa_alsa_strerror(err));
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -333,6 +333,9 @@ static int try_recover(struct userdata *u, const char *call, int err) {
 | 
				
			||||||
    if (err == -EPIPE)
 | 
					    if (err == -EPIPE)
 | 
				
			||||||
        pa_log_debug("%s: Buffer overrun!", call);
 | 
					        pa_log_debug("%s: Buffer overrun!", call);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (err == -ESTRPIPE)
 | 
				
			||||||
 | 
					        pa_log_debug("%s: System suspended!", call);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) < 0) {
 | 
					    if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) < 0) {
 | 
				
			||||||
        pa_log("%s: %s", call, pa_alsa_strerror(err));
 | 
					        pa_log("%s: %s", call, pa_alsa_strerror(err));
 | 
				
			||||||
        return -1;
 | 
					        return -1;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue