mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	virtual: Fix volume callback setting.
We want to set the volume callbacks only if volume sharing is not used. When volume sharing is used, we don't want to mess with the stream volumes. This was broken in 6c6b50
This commit is contained in:
		
							parent
							
								
									cf0bf5a4c2
								
							
						
					
					
						commit
						1824f6de6a
					
				
					 2 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
					@ -567,7 +567,7 @@ int pa__init(pa_module*m) {
 | 
				
			||||||
    u->sink->update_requested_latency = sink_update_requested_latency_cb;
 | 
					    u->sink->update_requested_latency = sink_update_requested_latency_cb;
 | 
				
			||||||
    u->sink->request_rewind = sink_request_rewind_cb;
 | 
					    u->sink->request_rewind = sink_request_rewind_cb;
 | 
				
			||||||
    pa_sink_set_set_mute_callback(u->sink, sink_set_mute_cb);
 | 
					    pa_sink_set_set_mute_callback(u->sink, sink_set_mute_cb);
 | 
				
			||||||
    if (use_volume_sharing) {
 | 
					    if (!use_volume_sharing) {
 | 
				
			||||||
        pa_sink_set_set_volume_callback(u->sink, sink_set_volume_cb);
 | 
					        pa_sink_set_set_volume_callback(u->sink, sink_set_volume_cb);
 | 
				
			||||||
        pa_sink_enable_decibel_volume(u->sink, TRUE);
 | 
					        pa_sink_enable_decibel_volume(u->sink, TRUE);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -594,7 +594,7 @@ int pa__init(pa_module*m) {
 | 
				
			||||||
    u->source->set_state = source_set_state_cb;
 | 
					    u->source->set_state = source_set_state_cb;
 | 
				
			||||||
    u->source->update_requested_latency = source_update_requested_latency_cb;
 | 
					    u->source->update_requested_latency = source_update_requested_latency_cb;
 | 
				
			||||||
    pa_source_set_set_mute_callback(u->source, source_set_mute_cb);
 | 
					    pa_source_set_set_mute_callback(u->source, source_set_mute_cb);
 | 
				
			||||||
    if (use_volume_sharing) {
 | 
					    if (!use_volume_sharing) {
 | 
				
			||||||
        pa_source_set_set_volume_callback(u->source, source_set_volume_cb);
 | 
					        pa_source_set_set_volume_callback(u->source, source_set_volume_cb);
 | 
				
			||||||
        pa_source_enable_decibel_volume(u->source, TRUE);
 | 
					        pa_source_enable_decibel_volume(u->source, TRUE);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue