Changeset 4438:cd8f86bcbadc in roaraudio
- Timestamp:
- 10/09/10 15:37:12 (14 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/Makefile
r4437 r4438 16 16 #DEFINES = -DDEBUG 17 17 #DEFINES = -DMONITOR_LATENCY 18 PKGDEFINES= -DPACKAGE_VERSION=" $(VERSION)" -DDEVICE_VENDOR_ID=$(DEV_VENDOR) -DDEVICE_VENDOR_NAME="$(DEV_VENDOR_NAME)" -DDEVICE_VENDOR_STRING="$(DEV_VENDOR_STRING)"18 PKGDEFINES= -DPACKAGE_VERSION="\"$(VERSION)\"" -DDEVICE_VENDOR_ID=$(DEV_VENDOR) -DDEVICE_VENDOR_NAME="\"$(DEV_VENDOR_NAME)\"" -DDEVICE_VENDOR_STRING="\"$(DEV_VENDOR_STRING)\"" 19 19 INCLUDE = -I../include -I./include 20 20 CFLAGS += -g -Wall -O2 $(DEFINES) $(PKGDEFINES) $(INCLUDE) $(INCPATH) -
roard/req.c
r4431 r4438 26 26 #include "roard.h" 27 27 28 // include for uname() used by req_on_server_info() 29 #ifdef ROAR_HAVE_UNAME 30 #include <sys/utsname.h> 31 #endif 32 28 33 static void * _dataspace(struct roar_message * mes, char ** data, uint32_t flags[2], size_t len) { 29 34 if ( len <= LIBROAR_BUFFER_MSGDATA ) … … 537 542 538 543 int req_on_server_info (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 544 #ifdef ROAR_HAVE_UNAME 545 struct utsname utsname; 546 #endif 539 547 struct roar_server_info info; 540 548 uint16_t * d16; … … 553 561 memset(&info, 0, sizeof(info)); 554 562 555 info.version = "roard/ ? <0/RoarAudio>";563 info.version = "roard/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING ">"; 556 564 info.location = g_config->location; 557 565 info.description = g_config->description; 566 567 #ifdef ROAR_HAVE_UNAME 568 if ( uname(&utsname) == 0 ) { 569 info.un.sysname = utsname.sysname; 570 info.un.release = utsname.release; 571 info.un.nodename = utsname.nodename; 572 info.un.machine = utsname.machine; 573 } 574 #endif 558 575 559 576 if ( roar_server_info_to_mes(mes, &info) == -1 )
Note: See TracChangeset
for help on using the changeset viewer.