mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	merge glitch-free branch back into trunk
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2445 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
		
							parent
							
								
									91f092eadc
								
							
						
					
					
						commit
						045c1d602d
					
				
					 189 changed files with 12559 additions and 4959 deletions
				
			
		| 
						 | 
				
			
			@ -372,7 +372,7 @@ static int hal_device_add_all(struct userdata *u, const char *capability) {
 | 
			
		|||
                pa_log_debug("Not loaded device %s", udis[i]);
 | 
			
		||||
            else {
 | 
			
		||||
                if (d->sink_name)
 | 
			
		||||
                    pa_scache_play_item_by_name(u->core, "pulse-coldplug", d->sink_name, PA_VOLUME_NORM, 0);
 | 
			
		||||
                    pa_scache_play_item_by_name(u->core, "pulse-coldplug", d->sink_name, FALSE, PA_VOLUME_NORM, NULL, NULL);
 | 
			
		||||
                count++;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			@ -412,7 +412,7 @@ static void device_added_time_cb(pa_mainloop_api *ea, pa_time_event *ev, const s
 | 
			
		|||
                pa_log_debug("Not loaded device %s", td->udi);
 | 
			
		||||
            else {
 | 
			
		||||
                if (d->sink_name)
 | 
			
		||||
                    pa_scache_play_item_by_name(td->u->core, "pulse-hotplug", d->sink_name, PA_VOLUME_NORM, 0);
 | 
			
		||||
                    pa_scache_play_item_by_name(td->u->core, "pulse-hotplug", d->sink_name, FALSE, PA_VOLUME_NORM, NULL, NULL);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			@ -575,7 +575,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
 | 
			
		|||
                        if (prev_suspended && !suspend) {
 | 
			
		||||
                            /* resume */
 | 
			
		||||
                            if (pa_sink_suspend(sink, 0) >= 0)
 | 
			
		||||
                                pa_scache_play_item_by_name(u->core, "pulse-access", d->sink_name, PA_VOLUME_NORM, 0);
 | 
			
		||||
                                pa_scache_play_item_by_name(u->core, "pulse-access", d->sink_name, FALSE, PA_VOLUME_NORM, NULL, NULL);
 | 
			
		||||
                            else
 | 
			
		||||
                                d->acl_race_fix = 1;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -643,7 +643,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
 | 
			
		|||
                    if (prev_suspended) {
 | 
			
		||||
                        /* resume */
 | 
			
		||||
                        if (pa_sink_suspend(sink, 0) >= 0)
 | 
			
		||||
                            pa_scache_play_item_by_name(u->core, "pulse-access", d->sink_name, PA_VOLUME_NORM, 0);
 | 
			
		||||
                            pa_scache_play_item_by_name(u->core, "pulse-access", d->sink_name, FALSE, PA_VOLUME_NORM, NULL, NULL);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue