mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	Add a configure switch to enable the per-user ESounD socket path, but default to vanilla ESounD's path. This way distributions and users can configure PulseAudio according to their ESounD library.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2083 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
		
							parent
							
								
									95a98fe6f2
								
							
						
					
					
						commit
						b94a6bc5b8
					
				
					 2 changed files with 15 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -218,7 +218,11 @@ int pa__init(pa_module*m) {
 | 
			
		|||
    char tmp[PATH_MAX];
 | 
			
		||||
 | 
			
		||||
#if defined(USE_PROTOCOL_ESOUND)
 | 
			
		||||
    char tmp2[PATH_MAX];
 | 
			
		||||
#if defined(USE_PERUSER_ESOUND_SOCKET)
 | 
			
		||||
    char esdsocketpath[PATH_MAX];
 | 
			
		||||
#else
 | 
			
		||||
    const char esdsocketpath[] = "/tmp/.esd/socket";
 | 
			
		||||
#endif
 | 
			
		||||
#endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -265,8 +269,10 @@ int pa__init(pa_module*m) {
 | 
			
		|||
 | 
			
		||||
#if defined(USE_PROTOCOL_ESOUND)
 | 
			
		||||
 | 
			
		||||
    snprintf(tmp2, sizeof(tmp2), "/tmp/.esd-%lu/socket", (unsigned long) getuid());
 | 
			
		||||
    pa_runtime_path(pa_modargs_get_value(ma, "socket", tmp2), tmp, sizeof(tmp));
 | 
			
		||||
#if defined(USE_PERUSER_ESOUND_SOCKET)
 | 
			
		||||
    snprintf(esdsocketpath, sizeof(esdsocketpath), "/tmp/.esd-%lu/socket", (unsigned long) getuid());
 | 
			
		||||
#endif
 | 
			
		||||
    pa_runtime_path(pa_modargs_get_value(ma, "socket", esdsocketpath), tmp, sizeof(tmp));
 | 
			
		||||
    u->socket_path = pa_xstrdup(tmp);
 | 
			
		||||
 | 
			
		||||
    /* This socket doesn't reside in our own runtime dir but in
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue