mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	Tried to get the volume information even upon init failure.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@626 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
		
							parent
							
								
									dcd202f8eb
								
							
						
					
					
						commit
						7b6a9c3829
					
				
					 2 changed files with 8 additions and 8 deletions
				
			
		| 
						 | 
				
			
			@ -410,16 +410,16 @@ int pa__init(pa_core *c, pa_module*m) {
 | 
			
		|||
    
 | 
			
		||||
    ret = 0;
 | 
			
		||||
 | 
			
		||||
finish:
 | 
			
		||||
     if (ma)
 | 
			
		||||
         pa_modargs_free(ma);
 | 
			
		||||
 | 
			
		||||
    /* Get initial mixer settings */
 | 
			
		||||
    if (u->sink->get_hw_volume)
 | 
			
		||||
        u->sink->get_hw_volume(u->sink);
 | 
			
		||||
    if (u->sink->get_hw_mute)
 | 
			
		||||
        u->sink->get_hw_mute(u->sink);
 | 
			
		||||
     
 | 
			
		||||
finish:
 | 
			
		||||
     if (ma)
 | 
			
		||||
         pa_modargs_free(ma);
 | 
			
		||||
    
 | 
			
		||||
    return ret;
 | 
			
		||||
 | 
			
		||||
fail:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -398,16 +398,16 @@ int pa__init(pa_core *c, pa_module*m) {
 | 
			
		|||
    
 | 
			
		||||
    ret = 0;
 | 
			
		||||
 | 
			
		||||
finish:
 | 
			
		||||
     if (ma)
 | 
			
		||||
         pa_modargs_free(ma);
 | 
			
		||||
 | 
			
		||||
    /* Get initial mixer settings */
 | 
			
		||||
    if (u->source->get_hw_volume)
 | 
			
		||||
        u->source->get_hw_volume(u->source);
 | 
			
		||||
    if (u->source->get_hw_mute)
 | 
			
		||||
        u->source->get_hw_mute(u->source);
 | 
			
		||||
 | 
			
		||||
finish:
 | 
			
		||||
     if (ma)
 | 
			
		||||
         pa_modargs_free(ma);
 | 
			
		||||
    
 | 
			
		||||
    return ret;
 | 
			
		||||
 | 
			
		||||
fail:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue