Codebase list squeezelite / 367bffc
whitespace cleanup Adrian Smith 9 years ago
11 changed file(s) with 61 addition(s) and 61 deletion(s). Raw diff Collapse all Expand all
+1
-1
dop.c less more
3636 u32_t next = 0;
3737
3838 while (frames--) {
39 if (((*lptr & 0x00FF0000) == 0x00050000 && (*rptr & 0x00FF0000) == 0x00050000) ||
39 if (((*lptr & 0x00FF0000) == 0x00050000 && (*rptr & 0x00FF0000) == 0x00050000) ||
4040 ((*lptr & 0x00FF0000) == 0x00FA0000 && (*rptr & 0x00FF0000) == 0x00FA0000)) {
4141 if (*lptr >> 24 == next) {
4242 matched++;
+1
-1
faad.c less more
227227
228228 // found media data, advance to start of first chunk and return
229229 if (!strcmp(type, "mdat")) {
230 _buf_inc_readp(streambuf, 8);
230 _buf_inc_readp(streambuf, 8);
231231 a->pos += 8;
232232 bytes -= 8;
233233 if (play) {
+10
-10
ffmpeg.c less more
609609 ff->avcodec_alloc_frame = dlsym(handle_codec, "avcodec_alloc_frame");
610610 ff->avcodec_free_frame = dlsym(handle_codec, "avcodec_free_frame");
611611 ff->avcodec_decode_audio4 = dlsym(handle_codec, "avcodec_decode_audio4");
612 ff->av_init_packet = dlsym(handle_codec, "av_init_packet");
613 ff->av_free_packet = dlsym(handle_codec, "av_free_packet");
612 ff->av_init_packet = dlsym(handle_codec, "av_init_packet");
613 ff->av_free_packet = dlsym(handle_codec, "av_free_packet");
614614
615615 if ((err = dlerror()) != NULL) {
616616 LOG_INFO("dlerror: %s", err);
619619
620620 LOG_INFO("loaded "LIBAVCODEC" (%u.%u.%u)", LIBAVCODEC_VERSION_MAJOR, ff->avcodec_version() >> 16, (ff->avcodec_version() >> 8) & 0xff, ff->avcodec_version() & 0xff);
621621
622 ff->avformat_version = dlsym(handle_format, "avformat_version");
623 ff->avformat_alloc_context = dlsym(handle_format, "avformat_alloc_context");
624 ff->avformat_free_context = dlsym(handle_format, "avformat_free_context");
625 ff->avformat_open_input = dlsym(handle_format, "avformat_open_input");
626 ff->avformat_find_stream_info = dlsym(handle_format, "avformat_find_stream_info");
627 ff->avio_alloc_context = dlsym(handle_format, "avio_alloc_context");
628 ff->av_read_frame = dlsym(handle_format, "av_read_frame");
629 ff->av_find_input_format= dlsym(handle_format, "av_find_input_format");
622 ff->avformat_version = dlsym(handle_format, "avformat_version");
623 ff->avformat_alloc_context = dlsym(handle_format, "avformat_alloc_context");
624 ff->avformat_free_context = dlsym(handle_format, "avformat_free_context");
625 ff->avformat_open_input = dlsym(handle_format, "avformat_open_input");
626 ff->avformat_find_stream_info = dlsym(handle_format, "avformat_find_stream_info");
627 ff->avio_alloc_context = dlsym(handle_format, "avio_alloc_context");
628 ff->av_read_frame = dlsym(handle_format, "av_read_frame");
629 ff->av_find_input_format= dlsym(handle_format, "av_find_input_format");
630630 ff->av_register_all = dlsym(handle_format, "av_register_all");
631631
632632 if ((err = dlerror()) != NULL) {
+10
-10
main.c less more
235235 optind += 1;
236236 } else {
237237 usage(argv[0]);
238 exit(0);
238 exit(0);
239239 }
240240
241241 switch (opt[0]) {
242 case 'o':
243 output_device = optarg;
244 break;
242 case 'o':
243 output_device = optarg;
244 break;
245245 case 'a':
246246 output_params = optarg;
247247 break;
259259 case 'e':
260260 exclude_codecs = optarg;
261261 break;
262 case 'd':
262 case 'd':
263263 {
264264 char *l = strtok(optarg, "=");
265265 char *v = strtok(NULL, "=");
277277 exit(0);
278278 }
279279 }
280 break;
280 break;
281281 case 'f':
282282 logfile = optarg;
283283 break;
397397 case 't':
398398 license();
399399 exit(0);
400 default:
401 break;
402 }
403 }
400 default:
401 break;
402 }
403 }
404404
405405 // warn if command line includes something which isn't parsed
406406 if (optind < argc) {
+2
-2
output_alsa.c less more
677677 LOG_INFO("memory locked");
678678 }
679679
680 mallopt(M_TRIM_THRESHOLD, -1);
681 mallopt(M_MMAP_MAX, 0);
680 mallopt(M_TRIM_THRESHOLD, -1);
681 mallopt(M_MMAP_MAX, 0);
682682
683683 touch_memory(silencebuf, MAX_SILENCE_FRAMES * BYTES_PER_FRAME);
684684 touch_memory(outputbuf->buf, outputbuf->size);
+4
-4
output_pa.c less more
5050 #endif
5151
5252 void list_devices(void) {
53 PaError err;
53 PaError err;
5454 int i;
5555
5656 if ((err = Pa_Initialize()) != paNoError) {
6666 }
6767 printf("\n");
6868
69 if ((err = Pa_Terminate()) != paNoError) {
69 if ((err = Pa_Terminate()) != paNoError) {
7070 LOG_WARN("error closing port audio: %s", Pa_GetErrorText(err));
7171 }
7272 }
403403
404404 LOG_INFO("requested latency: %u", output.latency);
405405
406 if ((err = Pa_Initialize()) != paNoError) {
406 if ((err = Pa_Initialize()) != paNoError) {
407407 LOG_WARN("error initialising port audio: %s", Pa_GetErrorText(err));
408408 exit(0);
409409 }
433433 }
434434 }
435435
436 if ((err = Pa_Terminate()) != paNoError) {
436 if ((err = Pa_Terminate()) != paNoError) {
437437 LOG_WARN("error closing port audio: %s", Pa_GetErrorText(err));
438438 }
439439
+1
-1
pcm.c less more
190190 if (decode.new_stream) {
191191 LOG_INFO("setting track_start");
192192 LOCK_O_not_direct;
193 output.next_sample_rate = decode_newstream(sample_rate, output.supported_rates);
193 output.next_sample_rate = decode_newstream(sample_rate, output.supported_rates);
194194 output.track_start = outputbuf->writep;
195195 IF_DSD( output.next_dop = false; )
196196 if (output.fade_mode) _checkfade(true);
+5
-5
slimproto.c less more
676676 }
677677
678678 in_addr_t discover_server(void) {
679 struct sockaddr_in d;
680 struct sockaddr_in s;
679 struct sockaddr_in d;
680 struct sockaddr_in s;
681681 char *buf;
682682 struct pollfd pollinfo;
683683
689689 buf = "e";
690690
691691 memset(&d, 0, sizeof(d));
692 d.sin_family = AF_INET;
692 d.sin_family = AF_INET;
693693 d.sin_port = htons(PORT);
694 d.sin_addr.s_addr = htonl(INADDR_BROADCAST);
694 d.sin_addr.s_addr = htonl(INADDR_BROADCAST);
695695
696696 pollinfo.fd = disc_sock;
697697 pollinfo.events = POLLIN;
723723 #define VAR_CAP_LEN 128
724724
725725 void slimproto(log_level level, char *server, u8_t mac[6], const char *name, const char *namefile, const char *modelname) {
726 struct sockaddr_in serv_addr;
726 struct sockaddr_in serv_addr;
727727 static char fixed_cap[FIXED_CAP_LEN], var_cap[VAR_CAP_LEN] = "";
728728 bool reconnect = false;
729729 unsigned failed_connect = 0;
+1
-1
slimproto.h less more
154154 // codec open - this is an extension to slimproto to allow the server to read the header and then return decode params
155155 struct codc_packet {
156156 char opcode[4];
157 u8_t format;
157 u8_t format;
158158 u8_t pcm_sample_size;
159159 u8_t pcm_sample_rate;
160160 u8_t pcm_channels;
+2
-2
stream.c less more
366366 }
367367
368368 void stream_sock(u32_t ip, u16_t port, const char *header, size_t header_len, unsigned threshold, bool cont_wait) {
369 struct sockaddr_in addr;
369 struct sockaddr_in addr;
370370
371371 int sock = socket(AF_INET, SOCK_STREAM, 0);
372372
385385 set_nonblock(sock);
386386 set_nosigpipe(sock);
387387
388 if (connect_timeout(sock, (struct sockaddr *) &addr, sizeof(addr), 10) < 0) {
388 if (connect_timeout(sock, (struct sockaddr *) &addr, sizeof(addr), 10) < 0) {
389389 LOG_INFO("unable to connect to server");
390390 LOCK;
391391 stream.state = DISCONNECT;
+24
-24
utils.c less more
6969 static char *str = NULL;
7070 char *ptr, *ret;
7171 if (src) str = src;
72 if (str && (ptr = strchr(str, c))) {
72 if (str && (ptr = strchr(str, c))) {
7373 ret = str;
7474 *ptr = '\0';
7575 str = ptr + 1;
102102 #if LINUX
103103 // search first 4 interfaces returned by IFCONF
104104 void get_mac(u8_t mac[]) {
105 struct ifconf ifc;
106 struct ifreq *ifr, *ifend;
107 struct ifreq ifreq;
108 struct ifreq ifs[4];
105 struct ifconf ifc;
106 struct ifreq *ifr, *ifend;
107 struct ifreq ifreq;
108 struct ifreq ifs[4];
109109
110110 mac[0] = mac[1] = mac[2] = mac[3] = mac[4] = mac[5] = 0;
111111
112 int s = socket(AF_INET, SOCK_DGRAM, 0);
113
114 ifc.ifc_len = sizeof(ifs);
115 ifc.ifc_req = ifs;
116
117 if (ioctl(s, SIOCGIFCONF, &ifc) == 0) {
112 int s = socket(AF_INET, SOCK_DGRAM, 0);
113
114 ifc.ifc_len = sizeof(ifs);
115 ifc.ifc_req = ifs;
116
117 if (ioctl(s, SIOCGIFCONF, &ifc) == 0) {
118118 ifend = ifs + (ifc.ifc_len / sizeof(struct ifreq));
119119
120120 for (ifr = ifc.ifc_req; ifr < ifend; ifr++) {
162162 #if WIN
163163 #pragma comment(lib, "IPHLPAPI.lib")
164164 void get_mac(u8_t mac[]) {
165 IP_ADAPTER_INFO AdapterInfo[16];
166 DWORD dwBufLen = sizeof(AdapterInfo);
167 DWORD dwStatus = GetAdaptersInfo(AdapterInfo, &dwBufLen);
165 IP_ADAPTER_INFO AdapterInfo[16];
166 DWORD dwBufLen = sizeof(AdapterInfo);
167 DWORD dwStatus = GetAdaptersInfo(AdapterInfo, &dwBufLen);
168168
169169 mac[0] = mac[1] = mac[2] = mac[3] = mac[4] = mac[5] = 0;
170170
315315
316316 #if WIN
317317 void winsock_init(void) {
318 WSADATA wsaData;
318 WSADATA wsaData;
319319 WORD wVersionRequested = MAKEWORD(2, 2);
320 int WSerr = WSAStartup(wVersionRequested, &wsaData);
321 if (WSerr != 0) {
322 LOG_ERROR("Bad winsock version");
323 exit(1);
324 }
320 int WSerr = WSAStartup(wVersionRequested, &wsaData);
321 if (WSerr != 0) {
322 LOG_ERROR("Bad winsock version");
323 exit(1);
324 }
325325 }
326326
327327 void winsock_close(void) {
365365 tv.tv_usec = 1000 * (timeout % 1000);
366366
367367 ret = select(fds[0].fd + 1, &r, &w, NULL, &tv);
368
368
369369 if (ret < 0) return ret;
370370
371371 fds[0].revents = 0;
382382 u8_t *ptr;
383383 for (ptr = buf; ptr < buf + size; ptr += sysconf(_SC_PAGESIZE)) {
384384 *ptr = 0;
385 }
386 }
387 #endif
385 }
386 }
387 #endif