mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	fix deadlock when resuming oss sinks
This commit is contained in:
		
							parent
							
								
									2199b8e1ad
								
							
						
					
					
						commit
						ab93f2a087
					
				
					 1 changed files with 5 additions and 2 deletions
				
			
		| 
						 | 
					@ -508,6 +508,9 @@ static int suspend(struct userdata *u) {
 | 
				
			||||||
    return 0;
 | 
					    return 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static int sink_get_volume(pa_sink *s);
 | 
				
			||||||
 | 
					static int source_get_volume(pa_source *s);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int unsuspend(struct userdata *u) {
 | 
					static int unsuspend(struct userdata *u) {
 | 
				
			||||||
    int m;
 | 
					    int m;
 | 
				
			||||||
    pa_sample_spec ss, *ss_original;
 | 
					    pa_sample_spec ss, *ss_original;
 | 
				
			||||||
| 
						 | 
					@ -598,9 +601,9 @@ static int unsuspend(struct userdata *u) {
 | 
				
			||||||
    build_pollfd(u);
 | 
					    build_pollfd(u);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (u->sink)
 | 
					    if (u->sink)
 | 
				
			||||||
        pa_sink_get_volume(u->sink);
 | 
					        sink_get_volume(u->sink);
 | 
				
			||||||
    if (u->source)
 | 
					    if (u->source)
 | 
				
			||||||
        pa_source_get_volume(u->source);
 | 
					        source_get_volume(u->source);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pa_log_info("Resumed successfully...");
 | 
					    pa_log_info("Resumed successfully...");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue