mirror of
				https://gitlab.freedesktop.org/pipewire/pipewire.git
				synced 2025-10-29 05:40:27 -04:00 
			
		
		
		
	jack: use pipewire version for minor/micro/proto
Use the pipewire header version for the minor/micro/proto in the jack version. That way the jack version will increment and we can easily see what pipewire version it was compied with.
This commit is contained in:
		
							parent
							
								
									5170724be4
								
							
						
					
					
						commit
						b710cd03d3
					
				
					 1 changed files with 7 additions and 4 deletions
				
			
		|  | @ -938,11 +938,11 @@ void jack_get_version(int *major_ptr, int *minor_ptr, int *micro_ptr, int *proto | ||||||
| 	if (major_ptr) | 	if (major_ptr) | ||||||
| 		*major_ptr = 3; | 		*major_ptr = 3; | ||||||
| 	if (minor_ptr) | 	if (minor_ptr) | ||||||
| 		*minor_ptr = 0; | 		*minor_ptr = PW_MAJOR; | ||||||
| 	if (micro_ptr) | 	if (micro_ptr) | ||||||
| 		*micro_ptr = 0; | 		*micro_ptr = PW_MINOR; | ||||||
| 	if (proto_ptr) | 	if (proto_ptr) | ||||||
| 		*proto_ptr = 0; | 		*proto_ptr = PW_MICRO; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| #define do_callback_expr(c,expr,callback,do_emit,...)		\ | #define do_callback_expr(c,expr,callback,do_emit,...)		\ | ||||||
|  | @ -989,7 +989,10 @@ const char * | ||||||
| jack_get_version_string(void) | jack_get_version_string(void) | ||||||
| { | { | ||||||
| 	static char name[1024]; | 	static char name[1024]; | ||||||
| 	snprintf(name, sizeof(name), "3.0.0.0 (using PipeWire %s)", pw_get_library_version()); | 	int major, minor, micro, proto; | ||||||
|  | 	jack_get_version(&major, &minor, µ, &proto); | ||||||
|  | 	snprintf(name, sizeof(name), "%d.%d.%d.%d (using PipeWire %s)", | ||||||
|  | 			major, minor, micro, proto, pw_get_library_version()); | ||||||
| 	return name; | 	return name; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Wim Taymans
						Wim Taymans