Changeset 5249:26fb6a2e20fc in roaraudio for roarclients
- Timestamp:
- 11/13/11 15:01:24 (12 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roarclients
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
roarclients/roardtmf.c
r4929 r5249 76 76 } 77 77 78 int calc (int16_t * samples, size_t len, int rate, char c) { 78 int calc_break (int16_t * samples, size_t len, int rate, char c) { 79 (void)rate, (void)c; 80 memset(samples, 0, len); 81 return 0; 82 } 83 84 int calc_tone (int16_t * samples, size_t len, int rate, char c) { 79 85 struct tone * ct = NULL; 80 86 int i; … … 128 134 size_t len; 129 135 char c; 136 int err; 130 137 131 138 for (i = 1; i < argc; i++) { … … 162 169 return 4; 163 170 164 if ( (vss = roar_vs_new_playback(server, name, rate, 1, ROAR_CODEC_DEFAULT, 16, NULL)) == NULL ) {165 fprintf(stderr, "Error: can not start playback \n");171 if ( (vss = roar_vs_new_playback(server, name, rate, 1, ROAR_CODEC_DEFAULT, 16, &err)) == NULL ) { 172 fprintf(stderr, "Error: can not start playback: %s\n", roar_vs_strerr(err)); 166 173 roar_mm_free(buf); 167 174 return 1; … … 171 178 tones++; 172 179 173 if ( c == ' ' || c == '+' || c == '.' || c == '_' )180 if ( c == '+' || c == '.' || c == '_' ) 174 181 continue; 175 182 176 if ( calc(buf, len, rate, c) == -1 ) { 183 if ( c == ' ' ) { 184 calc_break(buf, len, rate, c); 185 } else { 186 if ( calc_tone(buf, len, rate, c) == -1 ) { 187 roar_mm_free(buf); 188 return 5; 189 } 190 } 191 if ( roar_vs_write(vss, buf, len, &err) != (ssize_t)len ) { 192 fprintf(stderr, "Error: can not write data: %s\n", roar_vs_strerr(err)); 177 193 roar_mm_free(buf); 178 194 return 5; 179 195 } 180 roar_vs_write(vss, buf, len, NULL);181 196 } 182 197 -
roarclients/roarmonhttp.c
r5238 r5249 81 81 int ret; 82 82 83 roar_vio_nonblock(src, ROAR_SOCKET_NONBLOCK); 84 roar_vio_nonblock(dest, ROAR_SOCKET_NONBLOCK); 83 if ( roar_vio_nonblock(src, ROAR_SOCKET_NONBLOCK) == -1 ) { 84 ROAR_WARN("stream(dest=%p, src=%p): Can not set source stream non-blocking: %s", 85 dest, src, roar_error2str(roar_error)); 86 } 87 if ( roar_vio_nonblock(dest, ROAR_SOCKET_NONBLOCK) == -1 ) { 88 ROAR_WARN("stream(dest=%p, src=%p): Can not set destination stream non-blocking: %s", 89 dest, src, roar_error2str(roar_error)); 90 } 85 91 86 92 ROAR_VIO_SELECT_SETVIO(&(vios[0]), src, ROAR_VIO_SELECT_READ); … … 125 131 ring = cur; 126 132 } else { 127 roar_buffer_add(ring, cur); 133 if ( roar_buffer_add(ring, cur) == -1 ) { 134 ROAR_ERR("stream(dest=%p, src=%p): Can not append buffer to ring: %s", 135 dest, src, roar_error2str(roar_error)); 136 roar_buffer_free(ring); 137 roar_buffer_free(cur); 138 return -1; 139 } 128 140 } 129 141 } -
roarclients/roarsin.c
r5186 r5249 122 122 tcalc += step; 123 123 } 124 roar_vs_write(vss, out, 2048, NULL); 124 if ( roar_vs_write(vss, out, 2048, &err) != (ssize_t)2048 ) { 125 fprintf(stderr, "Error: can not write data: %s\n", roar_vs_strerr(err)); 126 break; 127 } 125 128 126 129 // this code enables us to generate the same signal for a long periode of time -
roarclients/roarvorbis.c
r5139 r5249 391 391 case we (the app) cares. In this case, we don't. */ 392 392 } else { 393 roar_vs_write(vss, pcmout, ret, NULL); 393 if ( roar_vs_write(vss, pcmout, ret, NULL) != (ssize_t)ret ) { 394 fprintf(stderr, "\nError: Can not write to server.\n"); 395 eof = 1; 396 continue; 397 } 394 398 bits_written += ret * 8; 395 399 if ( bits_written > bits_per_sec ) {
Note: See TracChangeset
for help on using the changeset viewer.