1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
# WARNING: this is a copy of the same file off www.mt-daapd.org with
# the path names fixed so that it works in OE
--- S/src/daap.c.orig 2005-09-07 21:41:41.000000000 -0500
+++ S/src/daap.c 2005-09-07 21:44:25.000000000 -0500
@@ -770,26 +770,28 @@
DAAP_BLOCK *daap_response_server_info(char *name, char *client_version) {
DAAP_BLOCK *root;
int g=1;
+ int mpro = 2 << 16;
+ int apro = 3 << 16;
DPRINTF(E_DBG,L_DAAP,"Preparing to send server-info for client ver %s\n",client_version);
root=daap_add_empty(NULL,"msrv");
if(root) {
- g = (int)daap_add_int(root,"mstt",200); /* result */
- if((!client_version)||(!strcmp(client_version,"3.0"))) {
- g = g && daap_add_int(root,"mpro",2 << 16); /* dmap proto ? */
- g = g && daap_add_int(root,"apro",3 << 16); /* daap protocol */
- } else {
- if(!strcmp(client_version,"1.0")) {
- g = g && daap_add_int(root,"mpro",1 << 16); /* dmap proto ? */
- g = g && daap_add_int(root,"apro",1 << 16); /* daap protocol */
- } else if(!strcmp(client_version,"2.0")) {
- g = g && daap_add_int(root,"mpro",1 << 16); /* dmap proto ? */
- g = g && daap_add_int(root,"apro",2 << 16); /* daap protocol */
- }
+ if((client_version) && (!strcmp(client_version,"1.0"))) {
+ mpro = 1 << 16;
+ apro = 1 << 16;
+ }
+
+ if((client_version) && (!strcmp(client_version,"2.0"))) {
+ mpro = 1 << 16;
+ apro = 2 << 16;
}
+ g = (int)daap_add_int(root,"mstt",200); /* result */
+ g = g && daap_add_int(root,"mpro",mpro); /* dmap proto ? */
+ g = g && daap_add_int(root,"apro",apro); /* daap protocol */
+
g = g && daap_add_string(root,"minm",name); /* server name */
#if 0
|
