|
8 | 8 | " -m <mac addr>\t\tSet mac address, format: ab:cd:ef:12:34:56\n"
|
9 | 9 | " -M <modelname>\tSet the squeezelite player model name sent to the server (default: " MODEL_NAME_STRING ")\n"
|
10 | 10 | " -n <name>\t\tSet the player name\n"
|
11 |
| -@@ -304,6 +305,8 @@ int main(int argc, char **argv) { |
| 11 | +@@ -307,6 +308,8 @@ int main(int argc, char **argv) { |
12 | 12 | extern bool user_rates;
|
13 | 13 | char *logfile = NULL;
|
14 | 14 | u8_t mac[6];
|
|
17 | 17 | unsigned stream_buf_size = STREAMBUF_SIZE;
|
18 | 18 | unsigned output_buf_size = 0; // set later
|
19 | 19 | unsigned rates[MAX_SUPPORTED_SAMPLERATES] = { 0 };
|
20 |
| -@@ -344,6 +347,7 @@ int main(int argc, char **argv) { |
| 20 | +@@ -347,6 +350,7 @@ int main(int argc, char **argv) { |
21 | 21 |
|
22 | 22 | int maxSampleRate = 0;
|
23 | 23 |
|
24 | 24 | + memset(mac, 0, sizeof(mac));
|
25 | 25 | char *optarg = NULL;
|
26 | 26 | int optind = 1;
|
27 | 27 | int i;
|
28 |
| -@@ -351,8 +355,6 @@ int main(int argc, char **argv) { |
| 28 | +@@ -354,8 +358,6 @@ int main(int argc, char **argv) { |
29 | 29 | #define MAXCMDLINE 512
|
30 | 30 | char cmdline[MAXCMDLINE] = "";
|
31 | 31 |
|
|
34 | 34 | for (i = 0; i < argc && (strlen(argv[i]) + strlen(cmdline) + 2 < MAXCMDLINE); i++) {
|
35 | 35 | strcat(cmdline, argv[i]);
|
36 | 36 | strcat(cmdline, " ");
|
37 |
| -@@ -360,7 +362,7 @@ int main(int argc, char **argv) { |
| 37 | +@@ -363,7 +365,7 @@ int main(int argc, char **argv) { |
38 | 38 |
|
39 | 39 | while (optind < argc && strlen(argv[optind]) >= 2 && argv[optind][0] == '-') {
|
40 | 40 | char *opt = argv[optind] + 1;
|
|
43 | 43 | #if ALSA
|
44 | 44 | "UVO"
|
45 | 45 | #endif
|
46 |
| -@@ -454,6 +456,9 @@ int main(int argc, char **argv) { |
| 46 | +@@ -457,6 +459,9 @@ int main(int argc, char **argv) { |
47 | 47 | case 'f':
|
48 | 48 | logfile = optarg;
|
49 | 49 | break;
|
|
53 | 53 | case 'm':
|
54 | 54 | {
|
55 | 55 | int byte = 0;
|
56 |
| -@@ -767,6 +772,11 @@ int main(int argc, char **argv) { |
| 56 | +@@ -774,6 +779,11 @@ int main(int argc, char **argv) { |
57 | 57 | winsock_init();
|
58 | 58 | #endif
|
59 | 59 |
|
|
65 | 65 | stream_init(log_stream, stream_buf_size);
|
66 | 66 |
|
67 | 67 | if (!strcmp(output_device, "-")) {
|
68 |
| -@@ -813,7 +823,7 @@ int main(int argc, char **argv) { |
| 68 | +@@ -820,7 +830,7 @@ int main(int argc, char **argv) { |
69 | 69 | exit(1);
|
70 | 70 | }
|
71 | 71 |
|
|
85 | 85 | #define BASE_CAP "Model=squeezelite,AccuratePlayPoints=1,HasDigitalOut=1,HasPolarityInversion=1,Balance=1,Firmware=" VERSION
|
86 | 86 | #define SSL_CAP "CanHTTPS=1"
|
87 | 87 | const char *base_cap;
|
88 |
| -@@ -768,7 +768,7 @@ void wake_controller(void) { |
| 88 | +@@ -773,7 +773,7 @@ void wake_controller(void) { |
89 | 89 | wake_signal(wake_e);
|
90 | 90 | }
|
91 | 91 |
|
|
94 | 94 | struct sockaddr_in d;
|
95 | 95 | struct sockaddr_in s;
|
96 | 96 | char *buf;
|
97 |
| -@@ -785,7 +785,7 @@ in_addr_t discover_server(char *default_ |
| 97 | +@@ -790,7 +790,7 @@ in_addr_t discover_server(char *default_ |
98 | 98 | memset(&d, 0, sizeof(d));
|
99 | 99 | d.sin_family = AF_INET;
|
100 | 100 | d.sin_port = htons(PORT);
|
|
103 | 103 |
|
104 | 104 | pollinfo.fd = disc_sock;
|
105 | 105 | pollinfo.events = POLLIN;
|
106 |
| -@@ -820,7 +820,7 @@ in_addr_t discover_server(char *default_ |
| 106 | +@@ -825,7 +825,7 @@ in_addr_t discover_server(char *default_ |
107 | 107 | #define FIXED_CAP_LEN 256
|
108 | 108 | #define VAR_CAP_LEN 128
|
109 | 109 |
|
|
112 | 112 | struct sockaddr_in serv_addr;
|
113 | 113 | static char fixed_cap[FIXED_CAP_LEN], var_cap[VAR_CAP_LEN] = "";
|
114 | 114 | bool reconnect = false;
|
115 |
| -@@ -841,7 +841,7 @@ void slimproto(log_level level, char *se |
| 115 | +@@ -846,7 +846,7 @@ void slimproto(log_level level, char *se |
116 | 116 | }
|
117 | 117 |
|
118 | 118 | if (!slimproto_ip) {
|
|
121 | 121 | }
|
122 | 122 |
|
123 | 123 | if (!slimproto_port) {
|
124 |
| -@@ -926,7 +926,7 @@ void slimproto(log_level level, char *se |
| 124 | +@@ -931,7 +931,7 @@ void slimproto(log_level level, char *se |
125 | 125 |
|
126 | 126 | // rediscover server if it was not set at startup
|
127 | 127 | if (!server && ++failed_connect > 5) {
|
|
132 | 132 | } else {
|
133 | 133 | --- a/squeezelite.h
|
134 | 134 | +++ b/squeezelite.h
|
135 |
| -@@ -463,7 +463,7 @@ char* strcasestr(const char *haystack, c |
| 135 | +@@ -474,7 +474,7 @@ char* strcasestr(const char *haystack, c |
136 | 136 |
|
137 | 137 | char *next_param(char *src, char c);
|
138 | 138 | u32_t gettime_ms(void);
|
|
141 | 141 | void set_nonblock(sockfd s);
|
142 | 142 | void set_recvbufsize(sockfd s);
|
143 | 143 | int connect_timeout(sockfd sock, const struct sockaddr *addr, socklen_t addrlen, int timeout);
|
144 |
| -@@ -521,7 +521,7 @@ void buf_init(struct buffer *buf, size_t |
| 144 | +@@ -533,7 +533,7 @@ void buf_init(struct buffer *buf, size_t |
145 | 145 | void buf_destroy(struct buffer *buf);
|
146 | 146 |
|
147 | 147 | // slimproto.c
|
|
0 commit comments